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

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

3f741382cba28d60115935452e851b4c84a50d27