From: Matthias Krüger <matthias.krueger@famsik.de>
Date: Tue, 6 Aug 2013 13:41:26 +0000 (+0200)
Subject: Merge branch 'master' into matthiaskrgr/unsealedtrial2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e1e3bd491620c0e8225f65bf02e64be23cea924c;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'master' into matthiaskrgr/unsealedtrial2
---

e1e3bd491620c0e8225f65bf02e64be23cea924c