Merge remote-tracking branch 'origin/samual/balance'
authorRudolf Polzer <divverent@xonotic.org>
Thu, 19 May 2011 19:34:03 +0000 (21:34 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Thu, 19 May 2011 19:34:03 +0000 (21:34 +0200)

Trivial merge