From: Mirio Date: Thu, 20 Aug 2015 07:07:24 +0000 (+0200) Subject: Merge branch 'master' into mirio/geoplanetary X-Git-Tag: xonotic-v0.8.2~79^2~19 X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-maps.pk3dir.git;a=commitdiff_plain;h=4edea52693db1165366d4cda7741bb974114edcc Merge branch 'master' into mirio/geoplanetary --- 4edea52693db1165366d4cda7741bb974114edcc