Merge remote branch 'origin/tzork/turretfixes'
authorRudolf Polzer <divVerent@xonotic.org>
Fri, 7 Jan 2011 14:45:40 +0000 (15:45 +0100)
committerRudolf Polzer <divVerent@xonotic.org>
Fri, 7 Jan 2011 14:45:40 +0000 (15:45 +0100)

Trivial merge