From: Chris Koeritz <fred@gruntose.com>
Date: Tue, 14 Nov 2017 19:05:56 +0000 (-0500)
Subject: Merge branch 'dev' of feistymeow.org:feisty_meow into dev
X-Git-Tag: 2.140.100^2~13^2~5
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=48ac1651c18c1af85ad54d24124feccb566d909b;p=feisty_meow.git

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

48ac1651c18c1af85ad54d24124feccb566d909b