From: Lyberta <lyberta@lyberta.net>
Date: Sun, 21 Jan 2018 03:06:17 +0000 (+0300)
Subject: Merge branch 'master' into Lyberta/PlayerTemplates
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4c6e246aebd8df84365c989555f8600a5c704161;p=xonotic%2Fxonotic-data.pk3dir.git

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

4c6e246aebd8df84365c989555f8600a5c704161