From: Chris Koeritz <fred@gruntose.com>
Date: Fri, 10 Nov 2017 20:15:35 +0000 (-0500)
Subject: Merge branch 'master' of feistymeow.org:feisty_meow
X-Git-Tag: 2.140.92~2
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=9e96951ac621c4ded75ea5738980978779ad648d;p=feisty_meow.git

Merge branch 'master' of feistymeow.org:feisty_meow

grabbing the latest from dev
---

9e96951ac621c4ded75ea5738980978779ad648d