From: Chris Koeritz <fred@gruntose.com>
Date: Sat, 11 Nov 2017 20:57:35 +0000 (-0500)
Subject: Merge branch 'dev' of feistymeow.org:feisty_meow into dev
X-Git-Tag: 2.140.98^2~33^2~3
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=58ef1a07e683cb62296f090e966f97621cecdb7f;hp=837f850a942fb3f9403b71e9ec1297e710cd091a;p=feisty_meow.git

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

merge
---