From: Mario <mario@smbclan.net>
Date: Mon, 24 Oct 2016 22:59:40 +0000 (+1000)
Subject: Merge branch 'master' into Mario/xonoticless_fix
X-Git-Tag: xonotic-v0.8.2~470^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=544daa665f16f82cadc26e7d42241987fa4f7f00;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into Mario/xonoticless_fix
---

544daa665f16f82cadc26e7d42241987fa4f7f00