From: Matthias Krüger <matthias.krueger@famsik.de>
Date: Fri, 11 Sep 2015 21:05:47 +0000 (+0200)
Subject: Merge branch 'master' into matthiaskrgr/geoplanetary
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c948aded0eeb44e007817be5053277270c174ad6;p=xonotic%2Fxonotic-maps.pk3dir.git

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

c948aded0eeb44e007817be5053277270c174ad6