From: Chris Koeritz <fred@gruntose.com>
Date: Fri, 17 Nov 2017 14:43:19 +0000 (-0500)
Subject: Merge branch 'dev' of feistymeow.org:feisty_meow into dev
X-Git-Tag: 2.140.101^2~1^2~4
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=0bcd82b38cad09784ded713dfdaf6a799adffc16;p=feisty_meow.git

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

0bcd82b38cad09784ded713dfdaf6a799adffc16