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

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

660440ab489ab3e3e36e85473f3dbbf100df95de