From: Mario <mario@smbclan.net>
Date: Sun, 30 Sep 2018 12:26:19 +0000 (+1000)
Subject: Merge branch 'master' into Mario/duel
X-Git-Tag: xonotic-v0.8.5~1809^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=23a3837422cea42aa657984500da071b31bda24c;p=xonotic%2Fxonotic-data.pk3dir.git

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

23a3837422cea42aa657984500da071b31bda24c