Merge remote branch 'origin/savagex/assault-centerprint'
authorRudolf Polzer <divVerent@xonotic.org>
Mon, 29 Nov 2010 09:52:33 +0000 (10:52 +0100)
committerRudolf Polzer <divVerent@xonotic.org>
Mon, 29 Nov 2010 09:52:33 +0000 (10:52 +0100)

Trivial merge