From: Mario <mario@smbclan.net>
Date: Sat, 5 Aug 2017 10:05:12 +0000 (+1000)
Subject: Merge branch 'master' into Mario/monsters
X-Git-Tag: xonotic-v0.8.5~7^2~1^2~76
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=bc38004537ee56b108f2d4d37d59d3bb2408cb4c;p=xonotic%2Fxonotic-data.pk3dir.git

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

bc38004537ee56b108f2d4d37d59d3bb2408cb4c