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

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

f5d5771a382f1af89b58dbb2694f832315caf7e5