From: Lyberta <lyberta@lyberta.net>
Date: Wed, 27 Sep 2017 09:51:24 +0000 (+0300)
Subject: Merge branch 'master' into Lyberta/PlayerTemplates
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=41700263cd3c078fa186b396203ee0c1d0db6c25;p=xonotic%2Fxonotic-data.pk3dir.git

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

41700263cd3c078fa186b396203ee0c1d0db6c25