From: Mirio <opivy@hotmail.de>
Date: Wed, 8 Mar 2017 19:36:06 +0000 (+0100)
Subject: Merge branch 'master' into Mirio/geoplanetary
X-Git-Tag: xonotic-v0.8.2~79^2~7
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=063b76ea9f14637c487b6d65441219df126c4b89;p=xonotic%2Fxonotic-maps.pk3dir.git

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

063b76ea9f14637c487b6d65441219df126c4b89