From: Chris Koeritz <fred@gruntose.com>
Date: Fri, 10 Nov 2017 22:49:18 +0000 (-0500)
Subject: Merge branch 'release-2.140.92'
X-Git-Tag: 2.140.92
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=refs%2Ftags%2F2.140.92;hp=668c41b51990bc1b1a862ed09a33ac6f9cd16084;p=feisty_meow.git

Merge branch 'release-2.140.92'

bringing in release code for 2.140.92.
this marks a fairly painful learning process for git branches, but it seems like things have stabilized now.
---