From: Jon Trulson <jon@radscan.com>
Date: Mon, 23 Mar 2020 18:55:32 +0000 (-0600)
Subject: Merge branch 'master' into autotools-conversion
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=11af2add7ecaa29246aaa2daf6518fb2b8098def;p=oweals%2Fcde.git

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

11af2add7ecaa29246aaa2daf6518fb2b8098def