From: FruitieX <rasse@rasse-lappy.localdomain>
Date: Sat, 24 Jul 2010 12:48:08 +0000 (+0300)
Subject: Merge remote branch 'origin/divVerent/fruitbalance' into fruitiex/fruitbalance
X-Git-Tag: xonotic-v0.1.0preview~423^2~6
X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;h=6dfd6d200900e01039fe2805ecd8da21a0f8f510;p=xonotic%2Fxonotic-data.pk3dir.git

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

6dfd6d200900e01039fe2805ecd8da21a0f8f510