From: Chris Koeritz <fred@gruntose.com>
Date: Tue, 22 May 2018 16:00:24 +0000 (-0400)
Subject: Merge branch 'release-2.140.112'
X-Git-Tag: 2.140.112
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=41449934185b41dcf96f7cfe924a1861a0cdc738;p=feisty_meow.git

Merge branch 'release-2.140.112'

bringing in latest release code; see tag for update notes.
---

79562d8c24ba1d79fb91ab22ca0d534bc77efac0