From: Chris Koeritz <fred@gruntose.com>
Date: Tue, 14 Nov 2017 13:46:57 +0000 (+0000)
Subject: Merge branch 'dev' of feistymeow.org:feisty_meow into dev
X-Git-Tag: 2.140.99^2~1^2~1
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=e8dfef3a168e09a2537e0da81da84c9a317c9233;p=feisty_meow.git

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

e8dfef3a168e09a2537e0da81da84c9a317c9233