From: Mario <mario@smbclan.net>
Date: Sat, 31 Dec 2016 00:54:39 +0000 (+1000)
Subject: Merge branch 'master' into Mirio/balance
X-Git-Tag: xonotic-v0.8.2~339^2~2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=34e7f534e2015466228eb3a78c9857741b736dca;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into Mirio/balance
---

34e7f534e2015466228eb3a78c9857741b736dca