From: Mario Date: Sat, 14 Feb 2015 13:50:20 +0000 (+1100) Subject: Merge branch 'master' into Mario/buff_updates X-Git-Tag: xonotic-v0.8.1~18^2~24 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ca28b6851a3cc7cd9d8ff09db37eac2346f9ca7f;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' into Mario/buff_updates --- ca28b6851a3cc7cd9d8ff09db37eac2346f9ca7f