From: Chris Koeritz <fred@gruntose.com>
Date: Sat, 11 Nov 2017 22:27:35 +0000 (-0500)
Subject: Merge branch 'dev' of git://feistymeow.org/feisty_meow into dev
X-Git-Tag: 2.140.98^2~33^2^2
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=02b24d744e9a9760077668d9702aa81c03548a70;p=feisty_meow.git

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

02b24d744e9a9760077668d9702aa81c03548a70