Merge remote branch 'origin/tzork/turrets-assualt-fix'
authorRudolf Polzer <divVerent@xonotic.org>
Fri, 19 Nov 2010 11:42:47 +0000 (12:42 +0100)
committerRudolf Polzer <divVerent@xonotic.org>
Fri, 19 Nov 2010 11:42:47 +0000 (12:42 +0100)

Trivial merge