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

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

492455b6deaf1c06adbbb6500213dece0089de00