From: Lyberta <lyberta@lyberta.net>
Date: Wed, 12 Apr 2017 03:55:33 +0000 (+0300)
Subject: Merge branch 'master' into Lyberta/master
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=18ed711ff7ebbbc6c3d0d70653376fd41f576b97;p=xonotic%2Fxonotic-data.pk3dir.git

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

18ed711ff7ebbbc6c3d0d70653376fd41f576b97