From: Chris Koeritz <fred@gruntose.com>
Date: Fri, 10 Nov 2017 22:16:23 +0000 (+0000)
Subject: Merge branch 'dev' of feistymeow.org:feisty_meow into dev
X-Git-Tag: 2.140.92^2~1^2
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=130a17120755eef05b71014b7adf8f7c4def19fa;p=feisty_meow.git

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

fluffing issues
---

130a17120755eef05b71014b7adf8f7c4def19fa