From: RISCi_ATOM <bob@bobcall.me>
Date: Thu, 12 Apr 2018 18:51:21 +0000 (-0400)
Subject: Merge branch 'v1.4' into v1.5
X-Git-Tag: v1.4.5~18^2~3
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=3319cca784d957715431143ea671b270ba65bc06;p=librecmc%2Flibrecmc.git

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

3319cca784d957715431143ea671b270ba65bc06