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

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

896c58267933ab3c5267e9309ddbde122b6fbf25