From: Mario <mario@smbclan.net>
Date: Sat, 20 Oct 2018 20:43:07 +0000 (+1000)
Subject: Merge branch 'master' into Mario/monsters
X-Git-Tag: xonotic-v0.8.5~7^2~1^2~29
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=24838b78dcdc5e8f19f1a7dc819b1f9794e8dd5c;p=xonotic%2Fxonotic-data.pk3dir.git

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

24838b78dcdc5e8f19f1a7dc819b1f9794e8dd5c