From: Mirio Date: Mon, 31 Aug 2015 11:56:51 +0000 (+0200) Subject: Merge branch 'master' into mirio/geoplanetary X-Git-Tag: xonotic-v0.8.2~79^2~18 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ce1989ebcbd4d4f44b8ca07162e89345f3e398a8;p=xonotic%2Fxonotic-maps.pk3dir.git Merge branch 'master' into mirio/geoplanetary --- ce1989ebcbd4d4f44b8ca07162e89345f3e398a8