From: FruitieX <fruitiex@gmail.com>
Date: Tue, 30 Nov 2010 15:20:20 +0000 (+0200)
Subject: Merge branch 'master' into fruitiex/stormkeep
X-Git-Tag: xonotic-v0.1.0preview~22
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7d5921acbdb380c4e49d5810835abbf1e1cefb6e;p=xonotic%2Fxonotic-maps.pk3dir.git

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

7d5921acbdb380c4e49d5810835abbf1e1cefb6e