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

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

merging release
---

b6bf58bb1afa4b6c468239087cf14ed7d121d2e3