From: Martin Taibr <taibr.martin@gmail.com>
Date: Sun, 18 Aug 2019 10:29:46 +0000 (+0200)
Subject: Merge branch 'master' into martin-t/master2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=607485df3a63bcd07cba8b15cad8b90f9925e891;p=xonotic%2Fxonotic-data.pk3dir.git

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

607485df3a63bcd07cba8b15cad8b90f9925e891