From: Lyberta <lyberta@lyberta.net>
Date: Wed, 6 Jun 2018 10:54:50 +0000 (+0300)
Subject: Merge branch 'master' into Lyberta/TeamplayOverhaul
X-Git-Tag: xonotic-v0.8.5~1953^2~14
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=073cc17f87486bec59ac2b6f9c26bf1155dbd7d8;p=xonotic%2Fxonotic-data.pk3dir.git

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

073cc17f87486bec59ac2b6f9c26bf1155dbd7d8