From: Martin Taibr <taibr.martin@gmail.com>
Date: Sun, 4 Nov 2018 17:13:55 +0000 (+0000)
Subject: Merge branch 'martin-t/fix1994' into 'master'
X-Git-Tag: xonotic-v0.8.5~1727
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3d9eb7757e3157dee0f0988feb37864a226fff81;p=xonotic%2Fxonotic-data.pk3dir.git

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

Fix #1994 in a better way

Closes #1994

See merge request xonotic/xonotic-data.pk3dir!621
---

3d9eb7757e3157dee0f0988feb37864a226fff81