From: Chris Koeritz Date: Sat, 11 Nov 2017 05:57:53 +0000 (-0500) Subject: Merge branch 'master' of feistymeow.org:feisty_meow into dev X-Git-Tag: 2.140.95^2~2 X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=cd58e16dc150f5130a28360ada85d51c8ac78c71;p=feisty_meow.git Merge branch 'master' of feistymeow.org:feisty_meow into dev getting dev in synch with new master branch --- cd58e16dc150f5130a28360ada85d51c8ac78c71