Merge remote branch 'origin/fruitiex/balance'
authorRudolf Polzer <divVerent@xonotic.org>
Tue, 30 Nov 2010 11:15:34 +0000 (12:15 +0100)
committerRudolf Polzer <divVerent@xonotic.org>
Tue, 30 Nov 2010 11:15:34 +0000 (12:15 +0100)

Trivial merge