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

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

c50b2e0373ece7d78ce01ad9186d8bff462fc733