From: terencehill <piuntn@gmail.com>
Date: Mon, 14 Jan 2019 15:27:54 +0000 (+0000)
Subject: Merge branch 'Mario/fix_me' into 'master'
X-Git-Tag: xonotic-v0.8.5~1661
X-Git-Url: https://git.xonotic.org/?a=commitdiff_plain;h=8a4867ce715f19ce9b143a98443dcb0294a23ba6;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Mario/fix_me' into 'master'

Merge branch Mario/fix_me (XS merge request)

Closes #2120

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

8a4867ce715f19ce9b143a98443dcb0294a23ba6