From: Jon Trulson <jon@radscan.com>
Date: Mon, 5 Nov 2018 22:52:14 +0000 (-0700)
Subject: Merge branch 'master' into utf8-conversion-2
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=cf89ba1a77aa716db48ae814e3b1dbb5d50f17eb;p=oweals%2Fcde.git

Merge branch 'master' into utf8-conversion-2
---

cf89ba1a77aa716db48ae814e3b1dbb5d50f17eb