From: Mario <mario@smbclan.net>
Date: Mon, 9 Jan 2017 10:12:38 +0000 (+1000)
Subject: Merge branch 'master' into Mario/monsters
X-Git-Tag: xonotic-v0.8.5~7^2~1^2~95
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=1812e2b617828c0d6631ebf4bb1de2cf5e1072d6;p=xonotic%2Fxonotic-data.pk3dir.git

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

1812e2b617828c0d6631ebf4bb1de2cf5e1072d6