From: Lyberta <lyberta@lyberta.net>
Date: Fri, 9 Mar 2018 11:42:12 +0000 (+0300)
Subject: Merge branch 'Lyberta/TeamplayOverhaul' into Lyberta/Survival
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=9470de4e4ee033c39a0c5b12d4cd4b924f964a42;p=xonotic%2Fxonotic-data.pk3dir.git

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

9470de4e4ee033c39a0c5b12d4cd4b924f964a42