From: Lyberta <lyberta@lyberta.net>
Date: Sat, 14 Jul 2018 13:37:06 +0000 (+0300)
Subject: Merge branch 'master' into Lyberta/TeamplayOverhaul
X-Git-Tag: xonotic-v0.8.5~1953^2~2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=55a4614bcbabe7335c9a7c25bbb6458400b3a424;p=xonotic%2Fxonotic-data.pk3dir.git

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

55a4614bcbabe7335c9a7c25bbb6458400b3a424