From: Mirio <opivy@hotmail.de>
Date: Sat, 5 Sep 2015 12:57:07 +0000 (+0200)
Subject: Merge branch 'master' into Mirio/geoplanetary
X-Git-Tag: xonotic-v0.8.2~79^2~17
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=21dae6d774b04057c93d1acdb9db5bff05b3ce38;p=xonotic%2Fxonotic-maps.pk3dir.git

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

21dae6d774b04057c93d1acdb9db5bff05b3ce38