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

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

997c2d8fa920367ced59c398ed877be238627493