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

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

49788d5b763cee217d76a2078e96e51e6049078c