From: Jon Trulson <jon@radscan.com>
Date: Sat, 22 Sep 2018 21:50:13 +0000 (-0600)
Subject: Merge branch 'master' into cde-next
X-Git-Tag: 2.3.0a~26
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=2dadc23e0edeb0f055cabdc657a0e07bb64120bd;p=oweals%2Fcde.git

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

2dadc23e0edeb0f055cabdc657a0e07bb64120bd