From: Chris Koeritz <fred@gruntose.com>
Date: Wed, 15 Nov 2017 20:25:47 +0000 (-0500)
Subject: Merge branch 'dev' of feistymeow.org:feisty_meow into dev
X-Git-Tag: 2.140.100^2~5
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=505d9e85cb92480e22c852d78f9dd2baa2b38c02;p=feisty_meow.git

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

505d9e85cb92480e22c852d78f9dd2baa2b38c02