From: Lyberta <lyberta@lyberta.net>
Date: Wed, 5 Jul 2017 23:13:00 +0000 (+0300)
Subject: Merge branch 'master' into Lyberta/TeamplayFixes_
X-Git-Tag: xonotic-v0.8.5~2482^2~19
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=264c9f48d418d1ebd4b5ef5868b85f92644917dc;p=xonotic%2Fxonotic-data.pk3dir.git

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

264c9f48d418d1ebd4b5ef5868b85f92644917dc