From: Lyberta <lyberta@lyberta.net>
Date: Thu, 1 Jun 2017 10:15:17 +0000 (+0300)
Subject: Merge branch 'Lyberta/PlayerTemplates' into Lyberta/Survival
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=5f37f88eedf8daaa085282850dd1154b75814168;p=xonotic%2Fxonotic-data.pk3dir.git

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

5f37f88eedf8daaa085282850dd1154b75814168