From: Mario <mario@smbclan.net>
Date: Tue, 12 Jun 2018 05:24:17 +0000 (+1000)
Subject: Merge branch 'master' into Mario/monsters
X-Git-Tag: xonotic-v0.8.5~7^2~1^2~48
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=72d25a07e1372793d5c305972eb51892de6aeb75;p=xonotic%2Fxonotic-data.pk3dir.git

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

72d25a07e1372793d5c305972eb51892de6aeb75