From: Chris Koeritz <fred@gruntose.com>
Date: Fri, 10 Nov 2017 20:48:51 +0000 (-0500)
Subject: Merge branch 'dev' of feistymeow.org:feisty_meow into dev
X-Git-Tag: 2.140.92^2~7
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=afff950f497547f99b9df6287c6227868b5cfa3f;p=feisty_meow.git

Merge branch 'dev' of feistymeow.org:feisty_meow into dev

grabbing dev mainline
---

afff950f497547f99b9df6287c6227868b5cfa3f