From: Lyberta <lyberta@lyberta.net>
Date: Sat, 2 Dec 2017 15:51:57 +0000 (+0300)
Subject: Merge branch 'master' into Lyberta/TeamplayFixes2
X-Git-Tag: xonotic-v0.8.5~2415^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=refs%2Fmerge-requests%2F507%2Fhead;p=xonotic%2Fxonotic-data.pk3dir.git

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

a9c2426d7cc2e1f42f0e7469f95efffa29957293