Merge remote branch 'origin/cbrutail/nexballcreditfix'
authorRudolf Polzer <divVerent@xonotic.org>
Thu, 2 Dec 2010 12:41:27 +0000 (13:41 +0100)
committerRudolf Polzer <divVerent@xonotic.org>
Thu, 2 Dec 2010 12:41:27 +0000 (13:41 +0100)

Trivial merge