From: Mario <mario.mario@y7mail.com>
Date: Tue, 10 Sep 2019 13:31:46 +0000 (+0000)
Subject: Merge branch 'Mario/spike_removal' into 'master'
X-Git-Tag: xonotic-v0.8.5~1290
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=791468fd65145353c9e9b83e08fe432bfad15c6b;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Mario/spike_removal' into 'master'

Merge branch Mario/spike_removal (XS merge request)

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

791468fd65145353c9e9b83e08fe432bfad15c6b