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

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

6c27fe90b0454df3dbf7b098bc554fcb5eaa75d0