From: Mario <mario@smbclan.net>
Date: Mon, 23 Apr 2018 16:16:41 +0000 (+1000)
Subject: Merge branch 'master' into Mario/monsters
X-Git-Tag: xonotic-v0.8.5~7^2~1^2~56
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e259123719e072470e8fd479ffaf4d33f02cea2e;p=xonotic%2Fxonotic-data.pk3dir.git

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

e259123719e072470e8fd479ffaf4d33f02cea2e