From: Chris Koeritz <fred@gruntose.com>
Date: Fri, 10 Nov 2017 18:44:51 +0000 (-0500)
Subject: Merge branch 'master' of feistymeow.org:feisty_meow into dev
X-Git-Tag: 2.140.91^2~6
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=77ded0d658661eb134946fbd8c112edfc09769cb;p=feisty_meow.git

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

77ded0d658661eb134946fbd8c112edfc09769cb