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

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

edfd17461f13da502eaea1b993dc700e37a74068