From: Lyberta <lyberta@lyberta.net>
Date: Sat, 17 Feb 2018 16:36:56 +0000 (+0300)
Subject: Merge branch 'master' into Lyberta/PlayerTemplates
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3190da33db656f8ea62992efd9cdbca669dd8aff;p=xonotic%2Fxonotic-data.pk3dir.git

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

3190da33db656f8ea62992efd9cdbca669dd8aff