From: Chris Koeritz <fred@gruntose.com>
Date: Wed, 15 Nov 2017 02:36:34 +0000 (-0500)
Subject: Merge branch 'dev' of feistymeow.org:feisty_meow into dev
X-Git-Tag: 2.140.100^2~11^2~22
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=044810a08765bdc683cb8cdc54fb4d4cf12611b6;p=feisty_meow.git

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

044810a08765bdc683cb8cdc54fb4d4cf12611b6