From: Mirio <opivy@hotmail.de>
Date: Wed, 15 Apr 2015 23:35:54 +0000 (+0200)
Subject: Merge branch 'master' into mirio/geoplanetary
X-Git-Tag: xonotic-v0.8.2~79^2~22
X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;h=0cba88f20df5807bd56099b84f042e9ebd6b9a30;p=xonotic%2Fxonotic-maps.pk3dir.git

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

0cba88f20df5807bd56099b84f042e9ebd6b9a30