From: Lyberta <lyberta@lyberta.net>
Date: Sun, 18 Mar 2018 04:59:52 +0000 (+0300)
Subject: Merge branch 'master' into Lyberta/TeamplayOverhaul
X-Git-Tag: xonotic-v0.8.5~1953^2~30
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f950c7d3814c98b3603d60a11674a347d77444b2;p=xonotic%2Fxonotic-data.pk3dir.git

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

f950c7d3814c98b3603d60a11674a347d77444b2