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

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

07f808b41d3946b758e744c101d21f116a0b5779