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

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

14e7cef4146eb374b5767fbef0f5a5f856442680