Merge remote branch 'origin/tzork/moveturrets-fix'
authorRudolf Polzer <divVerent@xonotic.org>
Mon, 29 Nov 2010 09:38:44 +0000 (10:38 +0100)
committerRudolf Polzer <divVerent@xonotic.org>
Mon, 29 Nov 2010 09:38:44 +0000 (10:38 +0100)

Trivial merge