From: Lyberta <lyberta@lyberta.net>
Date: Sun, 27 Aug 2017 23:45:39 +0000 (+0300)
Subject: Merge branch 'Lyberta/TeamplayFixes_' into Lyberta/Survival
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=1ae4bd4e4ab336706299d833ec4fd293214e756e;p=xonotic%2Fxonotic-data.pk3dir.git

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

1ae4bd4e4ab336706299d833ec4fd293214e756e