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

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

f02a5a6d918df7f5fe12364036ec625330ca8a1c