From: Mirio <opivy@hotmail.de>
Date: Wed, 3 Dec 2014 23:06:00 +0000 (+0100)
Subject: Merge branch 'master' into mirio/geoplanetary
X-Git-Tag: xonotic-v0.8.2~79^2~35
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=20328628e1d2d323ec493324facc6c3e2758babc;p=xonotic%2Fxonotic-maps.pk3dir.git

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

20328628e1d2d323ec493324facc6c3e2758babc