From: Chris Koeritz <fred@gruntose.com>
Date: Mon, 11 Dec 2017 14:24:38 +0000 (-0500)
Subject: Merge branch 'dev' of feistymeow.org:feisty_meow into dev
X-Git-Tag: 2.140.106^2~34^2~17
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=59c52057a1be611dd2c560c9ebc309363115fecb;p=feisty_meow.git

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

59c52057a1be611dd2c560c9ebc309363115fecb