From: Mirio <opivy@hotmail.de>
Date: Wed, 2 Mar 2016 19:58:47 +0000 (+0100)
Subject: Merge branch 'master' into mirio/balance
X-Git-Tag: xonotic-v0.8.2~339^2~7
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=923c8fc119df8210450991c59b8567e2352e9412;p=xonotic%2Fxonotic-data.pk3dir.git

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

923c8fc119df8210450991c59b8567e2352e9412