Merge branch 'v1.4' of pi31415/libreCMC-cmh into v1.4
authorlibreCMC <info@librecmc.org>
Fri, 29 Dec 2017 19:16:10 +0000 (14:16 -0500)
committerGogs <gogs@fake.local>
Fri, 29 Dec 2017 19:16:10 +0000 (14:16 -0500)

Trivial merge