From: Chris Koeritz <fred@gruntose.com>
Date: Tue, 14 Nov 2017 20:56:51 +0000 (-0500)
Subject: Merge branch 'dev' of feistymeow.org:feisty_meow into dev
X-Git-Tag: 2.140.100^2~13^2~4
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=9332a8a521073507225240aeefe0da03d9b6753c;p=feisty_meow.git

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

9332a8a521073507225240aeefe0da03d9b6753c