From: Mario <mario@smbclan.net>
Date: Wed, 13 Jul 2016 07:01:46 +0000 (+1000)
Subject: Merge branch 'master' into Mario/balance
X-Git-Tag: xonotic-v0.8.2~700^2~78^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2300937585fd409c578a516ed5e051ba389646d4;p=xonotic%2Fxonotic-data.pk3dir.git

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

2300937585fd409c578a516ed5e051ba389646d4