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

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

7cd4c2a53d430cecbe0bf6a06742a8c02bc92966