From: Mirio <opivy@hotmail.de>
Date: Thu, 9 Jul 2015 19:10:52 +0000 (+0200)
Subject: Merge branch 'master' into mirio/geoplanetary
X-Git-Tag: xonotic-v0.8.2~79^2~20
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=5705046d6758f73d6aa4798c70afa3ef73363ea0;p=xonotic%2Fxonotic-maps.pk3dir.git

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

5705046d6758f73d6aa4798c70afa3ef73363ea0