From: Mirio <opivy@hotmail.de>
Date: Fri, 10 Mar 2017 20:26:11 +0000 (+0000)
Subject: Merge branch 'Mirio/geoplanetary' into 'master'
X-Git-Tag: xonotic-v0.8.2~79
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=fa9e5082afbb1ed81aee66c960c39e48e1204b08;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'Mirio/geoplanetary' into 'master'

Mirio/geoplanetary

See merge request !67
---

fa9e5082afbb1ed81aee66c960c39e48e1204b08