From: Mario <mario@smbclan.net>
Date: Fri, 17 Jun 2016 07:58:36 +0000 (+1000)
Subject: Merge branch 'master' into Mirio/balance
X-Git-Tag: xonotic-v0.8.2~339^2~3
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8ba1f6c672361186033b8bebc3be677ac94bd4da;p=xonotic%2Fxonotic-data.pk3dir.git

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

8ba1f6c672361186033b8bebc3be677ac94bd4da