From: Jon Trulson <jon@radscan.com>
Date: Sun, 4 Nov 2018 17:56:04 +0000 (-0700)
Subject: Merge branch 'master' into cde-next
X-Git-Tag: 2.3.0a~25
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=2c1f56d37c0f2434d7cfe00b14d9bf0151fd7220;p=oweals%2Fcde.git

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

2c1f56d37c0f2434d7cfe00b14d9bf0151fd7220