From: Martin Taibr <taibr.martin@gmail.com>
Date: Sat, 30 Nov 2019 22:02:35 +0000 (+0100)
Subject: Merge branch 'master' into martin-t/master2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=refs%2Fheads%2Fmartin-t%2Fmaster2;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into martin-t/master2
---

65108bd794fde5ba269583ad8c7c770788b69f72