From: Chris Koeritz <fred@gruntose.com>
Date: Sat, 18 Nov 2017 13:49:07 +0000 (-0500)
Subject: Merge branch 'dev' of feistymeow.org:feisty_meow into dev
X-Git-Tag: 2.140.102^2~2^2
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=6b9142cea57cb1d8478594f52acd3ed6ee015ac5;p=feisty_meow.git

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

6b9142cea57cb1d8478594f52acd3ed6ee015ac5