From: Chris Koeritz <fred@gruntose.com>
Date: Tue, 21 Nov 2017 14:23:04 +0000 (-0500)
Subject: Merge branch 'dev' of feistymeow.org:feisty_meow into dev
X-Git-Tag: 2.140.105^2~1
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=afef5e5127c1a2ef7362f2d705c39a9b1cbb910e;p=feisty_meow.git

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

afef5e5127c1a2ef7362f2d705c39a9b1cbb910e