From: FruitieX <rasse@rasse-lappy.localdomain>
Date: Thu, 29 Jul 2010 22:53:43 +0000 (+0300)
Subject: Merge branch 'master' into fruitiex/cubemaps
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3a5c1471ba0f4f601874663937751180eab04cb1;p=xonotic%2Fxonotic-maps.pk3dir.git

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

3a5c1471ba0f4f601874663937751180eab04cb1