From: Mario <mario.mario@y7mail.com>
Date: Tue, 7 Jul 2020 11:17:35 +0000 (+1000)
Subject: Merge branch 'master' into Mario/headshots
X-Git-Tag: xonotic-v0.8.5~829^2~5
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=1256aab45ebe41e9e107e8ec65a2ecdb9b2b92eb;p=xonotic%2Fxonotic-data.pk3dir.git

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

1256aab45ebe41e9e107e8ec65a2ecdb9b2b92eb