From: Chris Koeritz <fred@gruntose.com>
Date: Mon, 20 May 2019 19:13:29 +0000 (-0400)
Subject: Merge branch 'release-2.140.115'
X-Git-Tag: 2.140.115^0
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=34d1cb2e8687b826357db1d3821bf9e05cf6f13d;p=feisty_meow.git

Merge branch 'release-2.140.115'

bringing in the latest code from dev branch
---

34d1cb2e8687b826357db1d3821bf9e05cf6f13d