From: Lyberta <lyberta@lyberta.net>
Date: Sat, 27 May 2017 06:24:39 +0000 (+0300)
Subject: Merge branch 'Lyberta/PlayerTemplates' into Lyberta/Survival
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=efbd8c5b547b1cb77dca8afc6e6dc1ada0d4f082;p=xonotic%2Fxonotic-data.pk3dir.git

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

efbd8c5b547b1cb77dca8afc6e6dc1ada0d4f082