From: Chris Koeritz <fred@gruntose.com>
Date: Sat, 25 Nov 2017 12:20:20 +0000 (-0500)
Subject: Merge branch 'dev' of feistymeow.org:feisty_meow into dev
X-Git-Tag: 2.140.106^2~34^2~22
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=6155a9c3fc9cd7d40b8f820f261e5ef3c3e4fe0f;p=feisty_meow.git

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

6155a9c3fc9cd7d40b8f820f261e5ef3c3e4fe0f