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

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

ceb8fa8cca6b33458864ad003f00c21901fb84df