Merge branch 'master' of https://gogs.librecmc.org/libreCMC/libreCMC
authorRISCi_ATOM <bob@bobcall.me>
Mon, 20 Nov 2017 16:42:40 +0000 (11:42 -0500)
committerRISCi_ATOM <bob@bobcall.me>
Mon, 20 Nov 2017 16:42:40 +0000 (11:42 -0500)

Trivial merge