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

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

7dec77bd0cc64fb33471a45e5af920d14b14cead