From: Chris Koeritz <fred@gruntose.com>
Date: Wed, 15 Nov 2017 05:30:29 +0000 (-0500)
Subject: Merge branch 'dev' of feistymeow.org:feisty_meow into dev
X-Git-Tag: 2.140.100^2~11
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=adde1d6ea14a4e3b833d20ce1d26468797edf5b5;p=feisty_meow.git

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

adde1d6ea14a4e3b833d20ce1d26468797edf5b5