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

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

bringing in the newest changes.
---

fdcfc633582d7491e7af348ae3b023c5ee83de0b