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

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

ed472d70e7fbbc0eed4a60b62e285c362af49436