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

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

bc934283b04d7fe0f6d50eb795dbc887a6d38e47