From: Chris Koeritz <fred@gruntose.com>
Date: Mon, 13 Nov 2017 00:05:24 +0000 (+0000)
Subject: Merge branch 'dev' of feistymeow.org:feisty_meow into dev
X-Git-Tag: 2.140.98^2~3^2~1
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=18386ac9e693f232310da978c333d6f3816c00bc;p=feisty_meow.git

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

18386ac9e693f232310da978c333d6f3816c00bc