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

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

a747576f49be6b8e60417a818ef577748d1a38a5