From: Lyberta <lyberta@lyberta.net>
Date: Wed, 4 Apr 2018 16:44:14 +0000 (+0300)
Subject: Merge branch 'master' into Lyberta/TeamplayOverhaul
X-Git-Tag: xonotic-v0.8.5~1953^2~25
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=195d267efd270e8d9ff9b4565f67d5aa4dc7681f

Merge branch 'master' into Lyberta/TeamplayOverhaul
---

195d267efd270e8d9ff9b4565f67d5aa4dc7681f