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

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

6ea089f5fad5ff3f3efd37d0057d7d36a133dfdf