From: Chris Koeritz <fred@gruntose.com>
Date: Sat, 11 Nov 2017 13:29:48 +0000 (-0500)
Subject: Merge branch 'release-2.140.96' into dev
X-Git-Tag: 2.140.97^2~5
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=8915a7554c073a647b9f2579920e3b8e2d971b0a;hp=5aa569cd006505773d954b714f6f60f408f66e14;p=feisty_meow.git

Merge branch 'release-2.140.96' into dev

bringing in that crucial fix, finally.  only needed to wake up at 6am on saturday to get it going.
---