From: Rudolf Polzer Date: Thu, 20 Aug 2015 17:19:03 +0000 (+0200) Subject: Merge branch 'maint' (early part) X-Git-Tag: xonotic-v0.8.2~2067 X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=0a6d4cd16b83990beff55c8b7850a492da8864e2 Merge branch 'maint' (early part) --- 0a6d4cd16b83990beff55c8b7850a492da8864e2