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

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

86c5c2f40162d8499257ac1acdf41fe847e3b7e4