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

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

b64f7f56e53a0a80a8d9cb3f0605f8b355e48d3d