From: Lyberta <lyberta@lyberta.net>
Date: Fri, 17 Mar 2017 20:11:53 +0000 (+0300)
Subject: Merge branch 'master' into Lyberta/TeamplayFixes_
X-Git-Tag: xonotic-v0.8.5~2482^2~34
X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=a897ab142f0bd55cd3940041b995ad8c67df7443

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

a897ab142f0bd55cd3940041b995ad8c67df7443