From: Mario Date: Tue, 18 Nov 2014 06:40:27 +0000 (+1100) Subject: Merge branch 'master' into sev/luma X-Git-Tag: xonotic-v0.8.1~144^2~21 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=13a42acaac2ee6b7f0494b0a02cefc1e270d9727;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' into sev/luma --- 13a42acaac2ee6b7f0494b0a02cefc1e270d9727