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

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

93b443eaf10841da4e188a3d86b7f4de0acfcb97