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

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

7daf410c0bea849bf58033ffd7f5cbd38515b11b