From: Martin Taibr <taibr.martin@gmail.com>
Date: Sun, 30 Sep 2018 16:13:18 +0000 (+0200)
Subject: Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
X-Git-Tag: xonotic-v0.8.5~1807
X-Git-Url: http://de.git.xonotic.org/?a=commitdiff_plain;h=af6227b9be49e6b2e567f51183cd6ee466dcfcf9;p=xonotic%2Fxonotic-data.pk3dir.git

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

af6227b9be49e6b2e567f51183cd6ee466dcfcf9