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

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

a33174a8c379d36004cb6c1bf9a775cd5b89111d