Merge branch 'v1.4' of https://gogs.librecmc.org/librecmc/librecmc into v1.4
authorRISCi_ATOM <bob@bobcall.me>
Thu, 6 Sep 2018 08:30:39 +0000 (04:30 -0400)
committerRISCi_ATOM <bob@bobcall.me>
Thu, 6 Sep 2018 08:30:39 +0000 (04:30 -0400)

Trivial merge