From: RISCi_ATOM <bob@bobcall.me>
Date: Wed, 22 Jan 2020 14:55:08 +0000 (-0500)
Subject: Merge branch 'v1.5' into LTS
X-Git-Tag: v1.5.1-20200423~18
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=2ed3d344134ddc4c6b68f844cd47baeb6a6cd0e8;p=librecmc%2Flibrecmc.git

Merge branch 'v1.5' into LTS
---

2ed3d344134ddc4c6b68f844cd47baeb6a6cd0e8