From: Lyberta <lyberta@lyberta.net>
Date: Sat, 2 Dec 2017 15:58:30 +0000 (+0300)
Subject: Merge branch 'Lyberta/TeamplayFixes2' into Lyberta/master
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=dfbe8b15c80586f231833f50bc1e3b43cd7e3788;p=xonotic%2Fxonotic-data.pk3dir.git

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

dfbe8b15c80586f231833f50bc1e3b43cd7e3788