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

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

16ea4c9e1d2a9654a4448ce4710afc5dece742f7