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

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

36caa52a59c31190b777e09b6c5927eb667703f9