From: Chris Koeritz Date: Sun, 12 Nov 2017 17:56:19 +0000 (-0500) Subject: Merge branch 'dev' of feistymeow.org:feisty_meow into release-2.140.94 X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=refs%2Fheads%2Frelease-2.140.94;p=feisty_meow.git Merge branch 'dev' of feistymeow.org:feisty_meow into release-2.140.94 mistaken merge on branch. this got trapped on a machine where it then got updated out of band with the real release. --- c589a3686d4508c9c5ea7841deb9be251460ddc3