From: Chris Koeritz <fred@gruntose.com>
Date: Thu, 16 Nov 2017 14:46:25 +0000 (-0500)
Subject: Merge branch 'master' of feistymeow.org:feisty_meow into dev
X-Git-Tag: 2.140.101^2~19^2~10
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=9fd385b6436e6af3dcff5ca4b1a0eb47d6fb6abd;p=feisty_meow.git

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

9fd385b6436e6af3dcff5ca4b1a0eb47d6fb6abd