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

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

a2f42288898d1dcf7e155ad1649a8b89f6254a4d