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

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

50312417a09a0067c152b5673b0f6b8396c290c2