From: Chris Koeritz <fred@gruntose.com>
Date: Sun, 12 Nov 2017 01:48:55 +0000 (+0000)
Subject: Merge branch 'dev' of feistymeow.org:feisty_meow into dev
X-Git-Tag: 2.140.98^2~14^2~14
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=849347a374a803906378b9d64bff27608d1cfd2a;p=feisty_meow.git

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

849347a374a803906378b9d64bff27608d1cfd2a