From: Chris Koeritz <fred@gruntose.com>
Date: Tue, 21 Nov 2017 03:33:16 +0000 (-0500)
Subject: Merge branch 'dev' of feistymeow.org:feisty_meow into dev
X-Git-Tag: 2.140.103^2~3^2~1
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=3bffd1d24be0cb2940c4812a8c8f9cd034006131;p=feisty_meow.git

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

3bffd1d24be0cb2940c4812a8c8f9cd034006131