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

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

7d96a8f12248ea0e11ddfb3a9e7ca3ca361108af