From: Lyberta <lyberta@lyberta.net>
Date: Thu, 1 Jun 2017 13:09:35 +0000 (+0300)
Subject: Merge branch 'master' into Lyberta/PlayerTemplates
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=9bf3260f89b074f1e984f5ecbeffecfa85bbc18c;p=xonotic%2Fxonotic-data.pk3dir.git

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

9bf3260f89b074f1e984f5ecbeffecfa85bbc18c