From: Lyberta <lyberta@lyberta.net>
Date: Thu, 25 May 2017 19:28:03 +0000 (+0300)
Subject: Merge branch 'Lyberta/PlayerTemplates' into Lyberta/Survival
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0aadd05816464fd2e086b50b12c57b739fe439ae;p=xonotic%2Fxonotic-data.pk3dir.git

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

0aadd05816464fd2e086b50b12c57b739fe439ae