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

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

1f87757a687db7ce277c4e82fd12dbab5192ec68