From: Chris Koeritz <fred@gruntose.com>
Date: Fri, 17 Nov 2017 04:44:37 +0000 (-0500)
Subject: Merge branch 'dev' of feistymeow.org:feisty_meow into dev
X-Git-Tag: 2.140.101^2~1^2~5
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=2d17e7394578e14d5143e9e00bcafae4407d73e2;p=feisty_meow.git

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

2d17e7394578e14d5143e9e00bcafae4407d73e2