From: Lyberta <lyberta@lyberta.net>
Date: Thu, 15 Jun 2017 01:09:46 +0000 (+0300)
Subject: Merge branch 'Lyberta/TeamplayFixes_' into Lyberta/Survival
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=283193a7c5ecd48757742a876d6f2efa1fe2a40c;p=xonotic%2Fxonotic-data.pk3dir.git

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

283193a7c5ecd48757742a876d6f2efa1fe2a40c