From: FruitieX <rasse@rasse-lappy.localdomain>
Date: Thu, 22 Jul 2010 21:53:38 +0000 (+0300)
Subject: Merge branch 'master' into fruitiex/fruitbalance
X-Git-Tag: xonotic-v0.1.0preview~423^2~18^2~3
X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=e4a7633b12efcba95ceb2300d06e1413f3799ef9

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

e4a7633b12efcba95ceb2300d06e1413f3799ef9