From: Chris Koeritz <fred@gruntose.com>
Date: Tue, 12 Dec 2017 04:57:08 +0000 (-0500)
Subject: Merge branch 'dev' of feistymeow.org:feisty_meow into dev
X-Git-Tag: 2.140.106^2~34^2~15
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=7015189b281e69808ca379807565825ed24d52e7;p=feisty_meow.git

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

7015189b281e69808ca379807565825ed24d52e7