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

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

68af7b9ccb4b623e40115f4f77e010f8687d7535