From: Chris Koeritz <fred@gruntose.com>
Date: Sat, 18 Nov 2017 02:43:53 +0000 (-0500)
Subject: Merge branch 'release-2.140.101'
X-Git-Tag: 2.140.101^0
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=2c725838e22747dd922163daf376ea2b81395c5e;p=feisty_meow.git

Merge branch 'release-2.140.101'

bringing in the dev branch's changes.
---

2c725838e22747dd922163daf376ea2b81395c5e