From: Chris Koeritz <fred@gruntose.com>
Date: Tue, 21 Nov 2017 14:57:40 +0000 (-0500)
Subject: Merge branch 'dev' of feistymeow.org:feisty_meow into dev
X-Git-Tag: 2.140.106^2~34^2~30
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=a23fb700b26283d973e182afa5ec3e0a5da421d0;p=feisty_meow.git

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

a23fb700b26283d973e182afa5ec3e0a5da421d0