From: Mirio <opivy@hotmail.de>
Date: Wed, 20 Jan 2016 08:56:03 +0000 (+0100)
Subject: Merge branch 'master' into Mirio/geoplanetary
X-Git-Tag: xonotic-v0.8.2~79^2~15
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=151bbd75bff3d46009c8c1a2135b527432ead5b1;p=xonotic%2Fxonotic-maps.pk3dir.git

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

151bbd75bff3d46009c8c1a2135b527432ead5b1