From: Chris Koeritz <fred@gruntose.com>
Date: Tue, 21 Nov 2017 02:37:22 +0000 (-0500)
Subject: Merge branch 'dev' of feistymeow.org:feisty_meow into dev
X-Git-Tag: 2.140.103^2~8
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=ac2283fe044968659ac7a9d2ee5f888e5ddfd2cd;p=feisty_meow.git

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

ac2283fe044968659ac7a9d2ee5f888e5ddfd2cd