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

Merge branch 'Mario/balance'
---

122c757dbe8698bee8817683c35a1c348e30bfd8