From: Lyberta <lyberta@lyberta.net>
Date: Tue, 28 Nov 2017 09:45:24 +0000 (+0300)
Subject: Merge branch 'master' into Lyberta/TeamplayFixes2
X-Git-Tag: xonotic-v0.8.5~2415^2~3
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=1c616300cb338a07a8533141bb9b2f885c18a7e7;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into Lyberta/TeamplayFixes2
---

1c616300cb338a07a8533141bb9b2f885c18a7e7