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

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

952d98962c549dd030c0e6f0d527a704b5cf98e4