From: Lyberta <lyberta@lyberta.net>
Date: Sun, 2 Apr 2017 14:57:47 +0000 (+0300)
Subject: Merge branch 'master' into Lyberta/TeamplayFixes_
X-Git-Tag: xonotic-v0.8.5~2482^2~29
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8ab019133d20ec2f8291f85ad7ff2d58ba4594d0;p=xonotic%2Fxonotic-data.pk3dir.git

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

8ab019133d20ec2f8291f85ad7ff2d58ba4594d0