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

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

c2e738f12e17bd6c77e5748a38a4225d26b79ec9