From: Mario <zacjardine@y7mail.com>
Date: Sat, 31 Dec 2016 05:29:39 +0000 (+0000)
Subject: Merge branch 'Mirio/balance' into 'master'
X-Git-Tag: xonotic-v0.8.2~339
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=533d6edf085a586bad9635a9ed2cf1102ee58e0c;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Mirio/balance' into 'master'

Mirio/balance

See merge request !291
---

533d6edf085a586bad9635a9ed2cf1102ee58e0c