From: Matthias Krüger <matthias.krueger@famsik.de>
Date: Sun, 27 Oct 2013 13:45:26 +0000 (+0100)
Subject: Merge branch 'master' into matthiaskrgr/unsealedtrial3
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c37cec3476945901c088017e3f52aba0c7806521;p=xonotic%2Fxonotic-maps.pk3dir.git

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

c37cec3476945901c088017e3f52aba0c7806521