From: Chris Koeritz <fred@gruntose.com>
Date: Thu, 16 Nov 2017 22:54:28 +0000 (-0500)
Subject: Merge branch 'dev' of feistymeow.org:feisty_meow into dev
X-Git-Tag: 2.140.101^2~19^2
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=e84b096c2cbbd0b30beeefad5e5fe45dfeb329f1;p=feisty_meow.git

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

e84b096c2cbbd0b30beeefad5e5fe45dfeb329f1