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

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

cb19cce96d1237dbc25443fed43ee6962d42523f