From: Mirio Date: Fri, 6 Mar 2015 21:36:47 +0000 (+0100) Subject: Merge branch 'master' into mirio/geoplanetary X-Git-Tag: xonotic-v0.8.2~79^2~25 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c52527c7858cabf9d935963d7784305f83842e30;p=xonotic%2Fxonotic-maps.pk3dir.git Merge branch 'master' into mirio/geoplanetary --- c52527c7858cabf9d935963d7784305f83842e30