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

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

efbc9e0e0275b83fb711122357d5493a8488d080