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

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

56a8b71bcfe324f83044a12738004151ff2fc064