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

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

9e1c5073c695209999aa7ab8474d59861f0787c7