From: terencehill <piuntn@gmail.com>
Date: Thu, 3 Jun 2021 14:11:10 +0000 (+0000)
Subject: Merge branch 'bones_was_here/misc2' into 'master'
X-Git-Tag: xonotic-v0.8.5~405^2~19
X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=82d7ab427e32e5825ab91a08afef8e8be1457521

Merge branch 'bones_was_here/misc2' into 'master'

Misc low importance stuff

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

82d7ab427e32e5825ab91a08afef8e8be1457521