From: Chris Koeritz <fred@gruntose.com>
Date: Wed, 15 Nov 2017 19:30:28 +0000 (-0500)
Subject: Merge branch 'dev' of feistymeow.org:feisty_meow into dev
X-Git-Tag: 2.140.100^2~6^2
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=97773071266d15fb3b45adcc6c0e6c0b00d46fca;p=feisty_meow.git

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

97773071266d15fb3b45adcc6c0e6c0b00d46fca