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

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

b1af06f5551ce5562f7199ba635197415e4095eb