From: Mirio Date: Wed, 15 Apr 2015 23:35:38 +0000 (+0200) Subject: Merge branch 'master' into maddin/map-warfare X-Git-Tag: xonotic-v0.8.1~12^2~3 X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-maps.pk3dir.git;a=commitdiff_plain;h=12a4d062585d100dccf2a0df28eb59178449cb9c Merge branch 'master' into maddin/map-warfare --- 12a4d062585d100dccf2a0df28eb59178449cb9c