From: Chris Koeritz <fred@gruntose.com>
Date: Sat, 11 Nov 2017 13:32:55 +0000 (-0500)
Subject: Merge branch 'master' of feistymeow.org:feisty_meow into dev
X-Git-Tag: 2.140.97^2~4
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=367bfcacaae232a54627c24707a6d8023ae2053e;hp=8915a7554c073a647b9f2579920e3b8e2d971b0a;p=feisty_meow.git

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

bring in the release from master
---