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

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

01657ce78a9936b456444c0e2c400ea81e042087