From: Matthias Krüger <matthias.krueger@famsik.de>
Date: Tue, 10 Dec 2013 23:04:54 +0000 (+0100)
Subject: Merge branch 'master' into matthiaskrgr/unsealedtrial3
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c3054920397079a29f0c8f7c9c43e0e9200aefee;p=xonotic%2Fxonotic-maps.pk3dir.git

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

c3054920397079a29f0c8f7c9c43e0e9200aefee