From: Lyberta <lyberta@lyberta.net>
Date: Thu, 1 Jun 2017 15:05:36 +0000 (+0300)
Subject: Merge branch 'Lyberta/TeamplayFixes_' into Lyberta/Survival
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8f6a541520d8d756c30631f1db0b074ea6deb436;p=xonotic%2Fxonotic-data.pk3dir.git

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

8f6a541520d8d756c30631f1db0b074ea6deb436