From: Lyberta <lyberta@lyberta.net>
Date: Sat, 2 Sep 2017 18:53:41 +0000 (+0300)
Subject: Merge branch 'master' into Lyberta/TeamplayFixes_
X-Git-Tag: xonotic-v0.8.5~2482^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e520d4b32e53462b9e22a2a923f6ba2fe2909226;p=xonotic%2Fxonotic-data.pk3dir.git

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

e520d4b32e53462b9e22a2a923f6ba2fe2909226