From: Chris Koeritz <fred@gruntose.com>
Date: Fri, 15 Dec 2017 23:35:58 +0000 (-0500)
Subject: Merge branch 'dev' of feistymeow.org:feisty_meow into dev
X-Git-Tag: 2.140.106^2~11^2~3
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=855265f66789ebbc706a22009e0a8066fb0f3276;p=feisty_meow.git

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

855265f66789ebbc706a22009e0a8066fb0f3276