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

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

0dc41e87e1d1083e5df422492a277b1c65501c98