From: FruitieX <rasse@rasse-laptop.(none)>
Date: Sat, 9 Oct 2010 08:58:06 +0000 (+0300)
Subject: Merge remote branch 'origin/fruitiex/fruitbalance' into fruitiex/fruitbalance
X-Git-Tag: xonotic-v0.1.0preview~307^2~29
X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;h=80e6b68ddc210f337cae2cee7fdd694ffeb2f19a;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'origin/fruitiex/fruitbalance' into fruitiex/fruitbalance
---

80e6b68ddc210f337cae2cee7fdd694ffeb2f19a