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

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

0bf857b225e3f3cded8e7d1aa9bd662a889de9c3