From: Martin Taibr Date: Sun, 6 Nov 2016 14:47:13 +0000 (+0100) Subject: Merge branch 'master' into martin-t/msnt X-Git-Tag: xonotic-v0.8.2~456^2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=refs%2Fmerge-requests%2F383%2Fhead;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' into martin-t/msnt --- 7908f6be3a5bcdb29c7fc4ca663b919ed023b1f3