From: Lyberta <lyberta@lyberta.net>
Date: Wed, 4 Apr 2018 16:50:58 +0000 (+0300)
Subject: Merge branch 'master' into Lyberta/PlayerTemplates
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6e3f46e7666b5d62c78472f466585f43452b6442;p=xonotic%2Fxonotic-data.pk3dir.git

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

6e3f46e7666b5d62c78472f466585f43452b6442