From: Mario <zacjardine@y7mail.com>
Date: Sun, 12 Mar 2017 16:54:50 +0000 (+0000)
Subject: Merge branch 'Mario/killsound' into 'master'
X-Git-Tag: xonotic-v0.8.2~69
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e3cdd0d74d46d59d75de77615d19b3cfac4dad3e;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Mario/killsound' into 'master'

Merge branch Mario/killsound (XS merge request)

See merge request !397
---

e3cdd0d74d46d59d75de77615d19b3cfac4dad3e