From: Chris Koeritz <fred@gruntose.com>
Date: Thu, 14 Dec 2017 17:07:57 +0000 (-0500)
Subject: Merge branch 'dev' of feistymeow.org:feisty_meow into dev
X-Git-Tag: 2.140.106^2~34^2~3
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=8d6e24fca305613184c131eaa04b32389e9b0f70;p=feisty_meow.git

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

8d6e24fca305613184c131eaa04b32389e9b0f70