From: Chris Koeritz <fred@gruntose.com>
Date: Fri, 10 Nov 2017 20:37:39 +0000 (-0500)
Subject: Merge branch 'dev' of feistymeow.org:feisty_meow into dev
X-Git-Tag: 2.140.92^2~8
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=bcad991077315559548504a731a60a552fe3b3ea;hp=fc0c30c2b8ba564812510f0586b7edda8220b5ea;p=feisty_meow.git

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

merging in mainline
---