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

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

a51cbdfb38a5a52863e2fa4f1905022eba778e52