From: Lyberta <lyberta@lyberta.net>
Date: Sun, 4 Jun 2017 16:28:04 +0000 (+0300)
Subject: Merge branch 'Lyberta/TeamplayFixes_' into Lyberta/Survival
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=73a3c934440054ba3b245855d87dcd167ea32c61;p=xonotic%2Fxonotic-data.pk3dir.git

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

73a3c934440054ba3b245855d87dcd167ea32c61