From: Severin Meyer Date: Fri, 2 Jan 2015 09:47:07 +0000 (+0100) Subject: Merge branch 'master' into sev/luma X-Git-Tag: xonotic-v0.8.1~144^2~6 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2ff5923b5d3acdd9ed21ee37481c69586a6a7bf4;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' into sev/luma --- 2ff5923b5d3acdd9ed21ee37481c69586a6a7bf4