From: Mario <mario@smbclan.net>
Date: Fri, 5 Feb 2016 11:41:35 +0000 (+1000)
Subject: Merge branch 'master' into Mario/balance_v2
X-Git-Tag: xonotic-v0.8.2~1181^2~5
X-Git-Url: https://de.git.xonotic.org/?a=commitdiff_plain;h=88cada71f757dc552b46360e48673d7ceee850c1;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into Mario/balance_v2
---

88cada71f757dc552b46360e48673d7ceee850c1