From: FruitieX <rasse@rasse-lappy.localdomain>
Date: Sun, 25 Jul 2010 12:36:35 +0000 (+0300)
Subject: Merge remote branch 'origin/master' into fruitiex/fruitbalance
X-Git-Tag: xonotic-v0.1.0preview~414
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f05aeb24f0a5ca02ae8f96d10f3e5b84ee8cd86d;p=xonotic%2Fxonotic-data.pk3dir.git

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

f05aeb24f0a5ca02ae8f96d10f3e5b84ee8cd86d