From: Lyberta <lyberta@lyberta.net>
Date: Wed, 22 Aug 2018 10:32:08 +0000 (+0300)
Subject: Merge branch 'master' into Lyberta/TeamplayOverhaul2
X-Git-Tag: xonotic-v0.8.5~1899^2~3
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=fff62730123df4a2ef92904bc24d2520518e4e7f;p=xonotic%2Fxonotic-data.pk3dir.git

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

fff62730123df4a2ef92904bc24d2520518e4e7f