From: Chris Koeritz <fred@gruntose.com>
Date: Wed, 22 Nov 2017 17:12:37 +0000 (-0500)
Subject: Merge branch 'dev' of feistymeow.org:feisty_meow into dev
X-Git-Tag: 2.140.106^2~34^2~29
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=822cabf657c9d06bd2d06e054a21784cf36ec1b5;hp=--cc;p=feisty_meow.git

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

822cabf657c9d06bd2d06e054a21784cf36ec1b5