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

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

294667e4aa1cd97c9163a5ec656697e1b03beead