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

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

996859a8c83a890894a0d6e26c0dd78185ec1368