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

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

edf01df130d0d1877461561178b8833a9ab6051c