From: FruitieX <rasse@rasse-lappy.localdomain>
Date: Thu, 22 Jul 2010 16:51:12 +0000 (+0300)
Subject: Merge remote branch 'origin/master' into fruitiex/fruitbalance
X-Git-Tag: xonotic-v0.1.0preview~423^2~18^2~4
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=1216175333a1129260067a4f3ef26e9b43336ded;p=xonotic%2Fxonotic-data.pk3dir.git

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

1216175333a1129260067a4f3ef26e9b43336ded