From: RISCi_ATOM <bob@bobcall.me>
Date: Tue, 27 Feb 2018 05:17:30 +0000 (-0500)
Subject: Merge branch 'v1.4' into v1.5
X-Git-Tag: v1.4.5~18^2~10
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=16aee497c7d09859575bab4a904586735e600131;p=librecmc%2Flibrecmc.git

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

16aee497c7d09859575bab4a904586735e600131