Merge remote branch 'origin/fruitiex/balance'
authorRudolf Polzer <divVerent@xonotic.org>
Fri, 3 Dec 2010 07:30:32 +0000 (08:30 +0100)
committerRudolf Polzer <divVerent@xonotic.org>
Fri, 3 Dec 2010 07:30:32 +0000 (08:30 +0100)

Trivial merge