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

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

a49ba26b47eec8ecc7ab7320d01f641492c5d43c