From: Mario Date: Thu, 13 Nov 2014 11:06:07 +0000 (+1100) Subject: Merge remote-tracking branch 'origin/master' into Mario/buffs X-Git-Tag: xonotic-v0.8.0~171^2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f05fed142da4a7651282de5aafd8ae8c6b87623e;p=xonotic%2Fxonotic-data.pk3dir.git Merge remote-tracking branch 'origin/master' into Mario/buffs --- f05fed142da4a7651282de5aafd8ae8c6b87623e