From: Lyberta <lyberta@lyberta.net>
Date: Thu, 5 Apr 2018 00:57:25 +0000 (+0300)
Subject: Merge branch 'master' into Lyberta/TeamplayOverhaul
X-Git-Tag: xonotic-v0.8.5~1953^2~24
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b9d5c8d9237626af62c8dd05005af562e5aa33be;p=xonotic%2Fxonotic-data.pk3dir.git

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

b9d5c8d9237626af62c8dd05005af562e5aa33be