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

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

remerge
---

2072733f108c8b605b24a01baa43759403b00f49