Merge branch 'master' of RISCI_ATOM/libreCMC-wiki into master
authorlibreCMC <info@librecmc.org>
Mon, 16 Oct 2017 20:42:55 +0000 (16:42 -0400)
committerGogs <gogs@fake.local>
Mon, 16 Oct 2017 20:42:55 +0000 (16:42 -0400)

Trivial merge