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

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

80a8818fc461d0fe2975498425372d5756f0cb6d