Merge remote branch 'refs/remotes/origin/mirceakitsune/bugfix_funcbobbing_killtargeting'
authorRudolf Polzer <divVerent@xonotic.org>
Wed, 13 Oct 2010 07:31:26 +0000 (09:31 +0200)
committerRudolf Polzer <divVerent@xonotic.org>
Wed, 13 Oct 2010 07:31:26 +0000 (09:31 +0200)

Trivial merge