From: Mario <zacjardine@y7mail.com>
Date: Thu, 8 Feb 2018 00:21:35 +0000 (+0000)
Subject: Merge branch 'terencehill/assault_fix' into 'master'
X-Git-Tag: xonotic-v0.8.5~2339
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=9366bc8fa80268a5cc80044db3f38f98ecfea3e6;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'terencehill/assault_fix' into 'master'

Assault fix

Closes #1944

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

9366bc8fa80268a5cc80044db3f38f98ecfea3e6