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

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

8f95fd9bfa795cce1d92c11ef33ae71b539c14a3