From: Jon Trulson <jon@radscan.com>
Date: Sun, 15 Dec 2019 22:18:41 +0000 (-0700)
Subject: Merge branch 'master' into autotools-conversion
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=005c72b917b840d36afd82ae17dbacb45a2fe292;p=oweals%2Fcde.git

Merge branch 'master' into autotools-conversion
---

005c72b917b840d36afd82ae17dbacb45a2fe292