From: Chris Koeritz <fred@gruntose.com>
Date: Mon, 13 Nov 2017 18:44:33 +0000 (-0500)
Subject: Merge branch 'dev' of feistymeow.org:feisty_meow into dev
X-Git-Tag: 2.140.99^2~3^2~7
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=28380594fd8c6d4494dfb6232d25031e0de30d1c;p=feisty_meow.git

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

28380594fd8c6d4494dfb6232d25031e0de30d1c