From: Chris Koeritz <fred@gruntose.com>
Date: Mon, 18 Dec 2017 21:36:56 +0000 (-0500)
Subject: Merge branch 'dev' of feistymeow.org:feisty_meow into dev
X-Git-Tag: 2.140.106^2~2^2~1
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=0aa30bc7344648da680d1e202a01cd3eb343a8ab;p=feisty_meow.git

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

0aa30bc7344648da680d1e202a01cd3eb343a8ab