From: Mirio <opivy@hotmail.de>
Date: Tue, 27 Oct 2015 10:09:00 +0000 (+0100)
Subject: Merge branch 'master' into mirio/geoplanetary
X-Git-Tag: xonotic-v0.8.2~79^2~16
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2997d467aed3a87bda24a93d73d341ccb923cd34;p=xonotic%2Fxonotic-maps.pk3dir.git

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

2997d467aed3a87bda24a93d73d341ccb923cd34