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

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

b047bc6c8770d3d5e585bdf246062fcba1d5d324