From: Chris Koeritz 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/?a=commitdiff_plain;h=refs%2Fheads%2Frelease-2.140.92;p=feisty_meow.git Merge branch 'dev' of feistymeow.org:feisty_meow into release-2.140.92 updates from dev branch --- 668c41b51990bc1b1a862ed09a33ac6f9cd16084