From: Mario <zacjardine@y7mail.com>
Date: Wed, 25 Apr 2018 13:00:11 +0000 (+0000)
Subject: Merge branch 'TimePath/issues/1971' into 'master'
X-Git-Tag: xonotic-v0.8.5~2175
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c2f067fea43512b93f76dee00ba5eb11d7215c93;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'TimePath/issues/1971' into 'master'

Fix #1971 "Backtrace on stormkeep"

Closes #1971

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

c2f067fea43512b93f76dee00ba5eb11d7215c93