From: Chris Koeritz <fred@gruntose.com>
Date: Mon, 18 Dec 2017 02:05:35 +0000 (+0000)
Subject: Merge branch 'dev' of feistymeow.org:feisty_meow into dev
X-Git-Tag: 2.140.106^2~13^2~4
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=670ec7809eb1cc40da21970255510f9fa2413efe;p=feisty_meow.git

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

670ec7809eb1cc40da21970255510f9fa2413efe