From: Chris Koeritz <fred@gruntose.com>
Date: Sat, 11 Nov 2017 03:51:35 +0000 (-0500)
Subject: Merge branch 'dev' of feistymeow.org:feisty_meow into release-2.140.93
X-Git-Tag: 2.140.93^2~2
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=91441c16e9dca416743fe1ab7b2eb883a39b12ae;p=feisty_meow.git

Merge branch 'dev' of feistymeow.org:feisty_meow into release-2.140.93

back on release branch
---

91441c16e9dca416743fe1ab7b2eb883a39b12ae