From: Chris Koeritz <fred@gruntose.com>
Date: Tue, 14 Nov 2017 01:53:58 +0000 (-0500)
Subject: Merge branch 'dev' of feistymeow.org:feisty_meow into dev
X-Git-Tag: 2.140.99^2~3^2~4
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=519a5fb3d2f945d6627e457de37ef0c28f290538;p=feisty_meow.git

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

519a5fb3d2f945d6627e457de37ef0c28f290538