From: FruitieX <rasse@rasse-lappy.localdomain>
Date: Sat, 29 May 2010 15:44:23 +0000 (+0300)
Subject: Merge branch 'master' into fruitiex/stormkeep2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=85a8dbf9592564fcd1451dfa833c3139f1c5f2cf;p=xonotic%2Fxonotic-maps.pk3dir.git

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

85a8dbf9592564fcd1451dfa833c3139f1c5f2cf