From: Lyberta <lyberta@lyberta.net>
Date: Sun, 11 Feb 2018 02:35:05 +0000 (+0300)
Subject: Merge branch 'master' into Lyberta/PlayerTemplates
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=9a75d97de750f0541463fcbc07c60db7a3a6c325;p=xonotic%2Fxonotic-data.pk3dir.git

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

9a75d97de750f0541463fcbc07c60db7a3a6c325