From: Jon Trulson <jon@radscan.com>
Date: Sun, 24 Jun 2018 21:46:55 +0000 (-0600)
Subject: Merge branch 'master' into cde-next
X-Git-Tag: 2.3.0a~377
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=c2cabbfa8b990ff4a5c4fc7cf8f849f675dff2f4;p=oweals%2Fcde.git

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

c2cabbfa8b990ff4a5c4fc7cf8f849f675dff2f4