From: Lyberta <lyberta@lyberta.net>
Date: Fri, 27 Apr 2018 09:22:48 +0000 (+0300)
Subject: Merge branch 'master' into Lyberta/TeamplayOverhaul
X-Git-Tag: xonotic-v0.8.5~1953^2~15
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b8ad7477ca022feff76a1634c7ca8dcaaf54937c;p=xonotic%2Fxonotic-data.pk3dir.git

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

b8ad7477ca022feff76a1634c7ca8dcaaf54937c