From: Fred T. Hamster <fred@gruntose.com>
Date: Sun, 26 Nov 2017 17:38:33 +0000 (-0500)
Subject: Merge branch 'dev' of feistymeow.org:feisty_meow into dev
X-Git-Tag: 2.140.106^2~11^2~7
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=0980b2870576966f219969aaf95d9ddd98f6127d;p=feisty_meow.git

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

0980b2870576966f219969aaf95d9ddd98f6127d