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

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

a4d12589f1cd01826814842cde0b3eac95890bc9