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

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

0b11ad09255bcc8c89839e8812aff527a3d0b26d