From: FruitieX <rasse@rasse-lappy.localdomain>
Date: Wed, 21 Jul 2010 09:02:18 +0000 (+0300)
Subject: Merge branch 'master' into fruitiex/fruitbalance
X-Git-Tag: xonotic-v0.1.0preview~423^2~26^2~4
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=cdab827c3bb824ae263c1add2b551d76f524ef77;p=xonotic%2Fxonotic-data.pk3dir.git

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

cdab827c3bb824ae263c1add2b551d76f524ef77