From: Chris Koeritz <fred@gruntose.com>
Date: Mon, 13 Nov 2017 19:26:48 +0000 (-0500)
Subject: Merge branch 'dev' of feistymeow.org:feisty_meow into dev
X-Git-Tag: 2.140.99^2~3^2~6
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=59052c0946c69e760be37a2f98c5d7f9b87ab1cb;p=feisty_meow.git

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

59052c0946c69e760be37a2f98c5d7f9b87ab1cb