From: Mirio <opivy@hotmail.de>
Date: Sat, 30 Apr 2016 10:23:24 +0000 (+0200)
Subject: Merge branch 'master' into Mirio/balance
X-Git-Tag: xonotic-v0.8.2~339^2~5
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=42e255d014f2c6a1871177ea511f630624cdfb57

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

42e255d014f2c6a1871177ea511f630624cdfb57