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

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

c9a7f8442904ee2908fec87c2734032b9c84e4b8