From: Lyberta <lyberta@lyberta.net>
Date: Thu, 21 Sep 2017 23:05:28 +0000 (+0300)
Subject: Merge branch 'master' into Lyberta/master
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=1dbc36b11d68a693c711d9a743623625ce7db3a9;p=xonotic%2Fxonotic-data.pk3dir.git

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

1dbc36b11d68a693c711d9a743623625ce7db3a9