From: Mario <zacjardine@y7mail.com>
Date: Mon, 4 Sep 2017 00:17:53 +0000 (+0000)
Subject: Merge branch 'Lyberta/TeamplayFixes_' into 'master'
X-Git-Tag: xonotic-v0.8.5~2482
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=20ccc31755c6fb06ac47ab99105a6d6ab35beee2;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Lyberta/TeamplayFixes_' into 'master'

Teamplay fixes and improvements

See merge request !423
---

20ccc31755c6fb06ac47ab99105a6d6ab35beee2