From: Chris Koeritz <fred@gruntose.com>
Date: Sun, 12 Nov 2017 07:30:40 +0000 (-0500)
Subject: Merge branch 'dev' of feistymeow.org:feisty_meow into dev
X-Git-Tag: 2.140.98^2~4^2~18
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=e2cdc553cf7ed08e81bc91e407a4a91c0befc588;p=feisty_meow.git

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

e2cdc553cf7ed08e81bc91e407a4a91c0befc588