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)
commitd69f237a3430e4ad899d8eefd2ebee014e8a5399
treea8219f1b58ff89ae6b67fb707b61100e7e6736bd
parentf47c5b67c2a5b3ca1ecaf16fa5df3f80c045bfe9
parent760b360d9ab3afd641b91d435177393aa200f116
Merge remote branch 'origin/fruitiex/balance'