From: RISCI_ATOM <bob@bobcall.me>
Date: Tue, 23 Jan 2018 17:21:00 +0000 (-0500)
Subject: Merge branch 'v1.4' of somenut/libreCMC into v1.4
X-Git-Tag: v1.4.3~35
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=415698e432dffc74f4f69bc605607c05675d8042;p=librecmc%2Flibrecmc.git

Merge branch 'v1.4' of somenut/libreCMC into v1.4
---

415698e432dffc74f4f69bc605607c05675d8042