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

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

f134a25da56d9f4c3452cbd47a7ee97d795fc759