From: Chris Koeritz <fred@gruntose.com>
Date: Mon, 13 Nov 2017 00:06:25 +0000 (-0500)
Subject: Merge branch 'dev' of feistymeow.org:feisty_meow into dev
X-Git-Tag: 2.140.98^2~4^2~1
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;ds=inline;h=b3d999d497cb2560914f51be98bfb03492ec6e88;p=feisty_meow.git

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

b3d999d497cb2560914f51be98bfb03492ec6e88