From: Lyberta <lyberta@lyberta.net>
Date: Sat, 16 Jun 2018 09:07:58 +0000 (+0300)
Subject: Merge branch 'master' into Lyberta/TeamplayOverhaul
X-Git-Tag: xonotic-v0.8.5~1953^2~9
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4c659ff902dd85a9eceb9e2af9e3e8121985a230;p=xonotic%2Fxonotic-data.pk3dir.git

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

4c659ff902dd85a9eceb9e2af9e3e8121985a230