From: Martin Taibr <taibr.martin@gmail.com>
Date: Tue, 20 Aug 2019 11:43:35 +0000 (+0200)
Subject: Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
X-Git-Tag: xonotic-v0.8.5~1381
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ece7949e9a300c5fc2a65919e82e52dba765f5a3;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
---

ece7949e9a300c5fc2a65919e82e52dba765f5a3