Merge remote branch 'refs/remotes/origin/fruitiex/nerfstrafing'
authorRudolf Polzer <divverent@alientrap.org>
Fri, 4 Jun 2010 18:20:59 +0000 (20:20 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 4 Jun 2010 18:20:59 +0000 (20:20 +0200)

Trivial merge