From: Lyberta <lyberta@lyberta.net>
Date: Thu, 8 Mar 2018 15:15:36 +0000 (+0300)
Subject: Merge branch 'master' into Lyberta/TeamplayOverhaul
X-Git-Tag: xonotic-v0.8.5~1953^2~43
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=fd693e8de2eb31ad52a8d165f10e77bb06116a1b

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

fd693e8de2eb31ad52a8d165f10e77bb06116a1b