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

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

f1de3ef5c14344d2d13b9cb1bd00b8f68827bc1f