From: Mirio <opivy@hotmail.de>
Date: Sat, 5 Mar 2016 13:36:10 +0000 (+0100)
Subject: Merge branch 'master' into mirio/balance
X-Git-Tag: xonotic-v0.8.2~339^2~6
X-Git-Url: https://de.git.xonotic.org/?a=commitdiff_plain;h=e210d808c320b04a4f1a520bdb574439a97d66a8;p=xonotic%2Fxonotic-data.pk3dir.git

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

e210d808c320b04a4f1a520bdb574439a97d66a8