From: RISCi_ATOM <bob@bobcall.me>
Date: Mon, 29 Jun 2020 17:00:05 +0000 (-0400)
Subject: Merge branch 'v1.5' into LTS : v1.5.2
X-Git-Tag: v1.5.2
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=6d3dc7a6aeee75d0500755c1f5c570d239fe7dab;p=librecmc%2Flibrecmc.git

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

6d3dc7a6aeee75d0500755c1f5c570d239fe7dab