From: Lyberta <lyberta@lyberta.net>
Date: Wed, 22 Aug 2018 10:36:03 +0000 (+0300)
Subject: Merge branch 'master' into Lyberta/PlayerTemplates
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=refs%2Fheads%2FLyberta%2FPlayerTemplates;p=xonotic%2Fxonotic-data.pk3dir.git

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

9989aca77459e9bd305c86d71b1b6912ebca9a4e