From: Chris Koeritz <fred@gruntose.com>
Date: Sat, 11 Nov 2017 18:12:06 +0000 (-0500)
Subject: Merge branch 'master' of feistymeow.org:feisty_meow into dev
X-Git-Tag: 2.140.98^2~37
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=f7fa82786fd3e8a6a7b1f1cd74cd3399e63af6d5;p=feisty_meow.git

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

merging with latest release
---

f7fa82786fd3e8a6a7b1f1cd74cd3399e63af6d5