From: Mario <mario.mario@y7mail.com>
Date: Fri, 17 Jul 2020 07:42:39 +0000 (+1000)
Subject: Merge branch 'master' into Mario/q3_speaker_fix
X-Git-Tag: xonotic-v0.8.5~857^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=refs%2Fmerge-requests%2F844%2Fhead;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into Mario/q3_speaker_fix
---

f29ce8d347095c394b160ca62c5ff14110f05da8