From: Lyberta <lyberta@lyberta.net>
Date: Sat, 18 Mar 2017 13:48:23 +0000 (+0300)
Subject: Merge branch 'master' into Lyberta/TeamplayFixes_
X-Git-Tag: xonotic-v0.8.5~2482^2~33
X-Git-Url: https://de.git.xonotic.org/?a=commitdiff_plain;h=e2513379a97ff9ab28cdb4f5959912cb2a64985f;p=xonotic%2Fxonotic-data.pk3dir.git

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

e2513379a97ff9ab28cdb4f5959912cb2a64985f