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

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

ffa7a68279f738e2f46b81e35780d86e54f13efe