From: Chris Koeritz <fred@gruntose.com>
Date: Thu, 14 Dec 2017 06:32:52 +0000 (-0500)
Subject: Merge branch 'dev' of feistymeow.org:feisty_meow into dev
X-Git-Tag: 2.140.106^2~34^2~6
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=1acd6fb638652f894709d44a5ee0e3fa217b80b8;p=feisty_meow.git

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

1acd6fb638652f894709d44a5ee0e3fa217b80b8