From: FruitieX <rasse@rasse-lappy.localdomain>
Date: Fri, 30 Jul 2010 23:36:14 +0000 (+0300)
Subject: Merge branch 'master' into fruitiex/fruitbalance
X-Git-Tag: xonotic-v0.1.0preview~383
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=72fd26e05143a2e69e55239e6972bcf3cba86ba7;p=xonotic%2Fxonotic-data.pk3dir.git

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

72fd26e05143a2e69e55239e6972bcf3cba86ba7