From: Jon Trulson <jon@radscan.com>
Date: Thu, 2 Aug 2018 01:18:17 +0000 (-0600)
Subject: Merge branch 'master' into cde-next
X-Git-Tag: 2.3.0a~59
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f6d83dd5e3b95f8c12a958641fb5cfc01b0cd7c9;p=oweals%2Fcde.git

Merge branch 'master' into cde-next
---

f6d83dd5e3b95f8c12a958641fb5cfc01b0cd7c9