From: FruitieX <rasse@rasse-lappy.localdomain>
Date: Tue, 27 Jul 2010 20:02:05 +0000 (+0300)
Subject: Merge remote branch 'origin/master' into fruitiex/fruitbalance
X-Git-Tag: xonotic-v0.1.0preview~400
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=32bdfa0f68b705420eaab0128a400c42ca687c06;p=xonotic%2Fxonotic-data.pk3dir.git

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

32bdfa0f68b705420eaab0128a400c42ca687c06