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

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

806d430a3fb14671d33d841dfe693f80acb71691