From: Chris Koeritz <fred@gruntose.com>
Date: Fri, 10 Nov 2017 19:29:08 +0000 (-0500)
Subject: Merge branch 'dev' of feistymeow.org:feisty_meow into release-2.140.91
X-Git-Tag: 2.140.91^2
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=refs%2Fheads%2Frelease-2.140.91;hp=3f11b26ebf3d7bf9fb4fb00813034eda0076f8c0;p=feisty_meow.git

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

getting things snacky
---