Merge remote branch 'refs/remotes/origin/fruitiex/fruitbalance'
authorRudolf Polzer <divVerent@xonotic.org>
Wed, 13 Oct 2010 09:49:59 +0000 (11:49 +0200)
committerRudolf Polzer <divVerent@xonotic.org>
Wed, 13 Oct 2010 09:49:59 +0000 (11:49 +0200)

Trivial merge