From: Lyberta <lyberta@lyberta.net>
Date: Sun, 11 Mar 2018 06:06:40 +0000 (+0300)
Subject: Merge branch 'master' into Lyberta/TeamplayOverhaul
X-Git-Tag: xonotic-v0.8.5~1953^2~33
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=9f07996007328e0b2d732c458c9fb23182ef7ae9;p=xonotic%2Fxonotic-data.pk3dir.git

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

9f07996007328e0b2d732c458c9fb23182ef7ae9