From: Matthias Krüger <matthias.krueger@famsik.de>
Date: Tue, 1 Sep 2015 17:57:41 +0000 (+0200)
Subject: Merge branch 'master' into matthiaskrgr/unsealedtrial3
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=12c95aba7e51d3a348536b92252a3d902391bb78;p=xonotic%2Fxonotic-maps.pk3dir.git

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

12c95aba7e51d3a348536b92252a3d902391bb78