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

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

13b3279dfc496986ee50947a04101226a52a446f