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

Merge branch 'dev' of feistymeow.org:feisty_meow into release-2.140.92

updates from dev branch
---