From: Chris Koeritz <fred@gruntose.com>
Date: Tue, 14 Nov 2017 18:29:30 +0000 (-0500)
Subject: Merge branch 'release-2.140.99'
X-Git-Tag: 2.140.99
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=25e70d899634b0e51542f8207247498f4db98efd;hp=fdbcc8ac952b1cf1c84f92cd9b563ef1dd164310;p=feisty_meow.git

Merge branch 'release-2.140.99'

code changes for release 2.140.99
---