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

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

d9b8cad0e2ec1cc3bbfe766b70390d4e23febb1e