From: Chris Koeritz <fred@gruntose.com>
Date: Tue, 14 Nov 2017 03:46:05 +0000 (-0500)
Subject: Merge branch 'master' of feistymeow.org:feisty_meow into dev
X-Git-Tag: 2.140.99^2~14
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=782dfbaab6896769ac98ea43c18299b774d445d0;p=feisty_meow.git

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

782dfbaab6896769ac98ea43c18299b774d445d0