From: Chris Koeritz <fred@gruntose.com>
Date: Thu, 4 Oct 2018 21:55:54 +0000 (-0400)
Subject: Merge branch 'release-2.140.114' into dev
X-Git-Tag: 2.140.115^2~105
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=efb0412cafd0563cc4267eb4987315bcb2affa4c;p=feisty_meow.git

Merge branch 'release-2.140.114' into dev

pulling in main branch release changes.
---

efb0412cafd0563cc4267eb4987315bcb2affa4c