From: Chris Koeritz <fred@gruntose.com>
Date: Thu, 16 Nov 2017 02:13:00 +0000 (-0500)
Subject: Merge branch 'dev' of feistymeow.org:feisty_meow into dev
X-Git-Tag: 2.140.100^2~4^2~1
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=ae6b2f0798fedac926b3f6fd71008360b7e5c683;p=feisty_meow.git

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

ae6b2f0798fedac926b3f6fd71008360b7e5c683