From: Chris Koeritz 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/?p=feisty_meow.git;a=commitdiff_plain;h=367bfcacaae232a54627c24707a6d8023ae2053e Merge branch 'master' of feistymeow.org:feisty_meow into dev bring in the release from master --- 367bfcacaae232a54627c24707a6d8023ae2053e