From: Lyberta <lyberta@lyberta.net>
Date: Mon, 11 Jun 2018 10:15:27 +0000 (+0300)
Subject: Merge branch 'master' into Lyberta/TeamplayOverhaul
X-Git-Tag: xonotic-v0.8.5~1953^2~11
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=16bb4a51347c40ae0655bba054bc7cf201538e45;hp=16bb4a51347c40ae0655bba054bc7cf201538e45

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