From: Mario <mario@smbclan.net>
Date: Sun, 9 Apr 2017 06:25:21 +0000 (+1000)
Subject: Merge branch 'master' into Mario/monsters
X-Git-Tag: xonotic-v0.8.5~7^2~1^2~90
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2816b905d7f6a41fc28a2db7efc7a08f7ea56225;p=xonotic%2Fxonotic-data.pk3dir.git

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

2816b905d7f6a41fc28a2db7efc7a08f7ea56225