From: Chris Koeritz <fred@gruntose.com>
Date: Sat, 11 Nov 2017 13:30:39 +0000 (-0500)
Subject: Merge branch 'release-2.140.96'
X-Git-Tag: 2.140.96^0
X-Git-Url: https://feistymeow.org/gitweb/?p=feisty_meow.git;a=commitdiff_plain;h=7c691be10be57164d5338635245572801c8068b3

Merge branch 'release-2.140.96'

the promised crucial fix
---

7c691be10be57164d5338635245572801c8068b3