From: FruitieX <rasse@rasse-laptop.(none)>
Date: Wed, 13 Oct 2010 19:35:32 +0000 (+0300)
Subject: Merge branch 'master' into fruitiex/fruitbalance
X-Git-Tag: xonotic-v0.1.0preview~267^2~10^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=13ef1ff574dfa739e5c768d5dabaeed6dce7ad17;p=xonotic%2Fxonotic-data.pk3dir.git

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

13ef1ff574dfa739e5c768d5dabaeed6dce7ad17