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

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

3d54cf0e518853865bbb84dbe4b9c8f041a514e0