From: Lyberta <lyberta@lyberta.net>
Date: Wed, 25 Jul 2018 15:48:20 +0000 (+0300)
Subject: Merge branch 'master' into Lyberta/FixJoinBestTeam
X-Git-Tag: xonotic-v0.8.5~1899^2~18
X-Git-Url: https://de.git.xonotic.org/?a=commitdiff_plain;h=becfb70a12d8a13efec7ed3760533da6858916c1;p=xonotic%2Fxonotic-data.pk3dir.git

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

becfb70a12d8a13efec7ed3760533da6858916c1