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)
commit8475fcbe332ac456559680e8d1d36e7abb8c386f
tree7561d194e8b750ed3c1f4360504e15702be9f81d
parent220b53b356c5d80ab29559bd2a4e3d9e256ef4e9
parentec02f49689f9347b6c2886031d965a7ac978314f
Merge remote branch 'refs/remotes/origin/fruitiex/fruitbalance'