From: FruitieX <rasse@rasse-lappy.localdomain>
Date: Wed, 21 Jul 2010 11:15:20 +0000 (+0300)
Subject: Merge branch 'fruitiex/fruitbalance' of ssh://git.xonotic.org/xonotic-data.pk3dir... 
X-Git-Tag: xonotic-v0.1.0preview~423^2~26^2
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=24c2148c1ceb17186cc4e77279d7810d9f398f36

Merge branch 'fruitiex/fruitbalance' of ssh://git.xonotic.org/xonotic-data.pk3dir into fruitiex/fruitbalance
---

24c2148c1ceb17186cc4e77279d7810d9f398f36