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

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

3320fe0aee23e3d87da171e2d5dc2607d8164833