From: Jon Trulson <jon@radscan.com>
Date: Thu, 8 Nov 2018 21:51:46 +0000 (-0700)
Subject: Merge branch 'master' into utf8-conversion
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=2902373dbbca65ce0472214df5b69698ab85a4ed;p=oweals%2Fcde.git

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

2902373dbbca65ce0472214df5b69698ab85a4ed