From: Chris Koeritz <fred@gruntose.com>
Date: Sun, 12 Nov 2017 07:22:22 +0000 (-0500)
Subject: Merge branch 'dev' of feistymeow.org:feisty_meow into dev
X-Git-Tag: 2.140.98^2~4^2~19
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=a89fb56cc9c406a421dc4c32ac2e78ef70346b48;p=feisty_meow.git

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

a89fb56cc9c406a421dc4c32ac2e78ef70346b48