From: Mario <mario@smbclan.net>
Date: Sun, 21 Oct 2018 16:52:27 +0000 (+1000)
Subject: Merge branch 'master' into Mario/mapinfo_title_fix
X-Git-Tag: xonotic-v0.8.5~1750^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b9998b31fc75c66b601e66241350b10ca694809f;p=xonotic%2Fxonotic-data.pk3dir.git

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

b9998b31fc75c66b601e66241350b10ca694809f