From: Mirio Date: Tue, 25 Oct 2016 22:37:47 +0000 (+0200) Subject: Merge branch 'master' into Mirio/geoplanetary X-Git-Tag: xonotic-v0.8.2~79^2~13 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b1c781bc35aacb98ed9966d664460289260eb1fa;p=xonotic%2Fxonotic-maps.pk3dir.git Merge branch 'master' into Mirio/geoplanetary --- b1c781bc35aacb98ed9966d664460289260eb1fa