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)
commitc45bfd705e661594c1edbd1f8d57d2badb709e7a
treed7ad3df68b293491fef1bf1adf1cfd150d0e8cfd
parentc96303a4cf08c3a73d9f111f81cb915bc06ae510
parent0a79dacada6048f62fad2d91fba7fc761f57464a
Merge remote-tracking branch 'origin/samual/balance'