From: Chris Koeritz <fred@gruntose.com>
Date: Fri, 17 Nov 2017 03:27:11 +0000 (-0500)
Subject: Merge branch 'dev' of feistymeow.org:feisty_meow into dev
X-Git-Tag: 2.140.101^2~1^2~6
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=aa1de8832842a8fdaaeba75747b58210a8dd6b55;p=feisty_meow.git

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

aa1de8832842a8fdaaeba75747b58210a8dd6b55