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

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

2fafb24c4c0f9547564c922fe8a57c40dd2d9938