From: Chris Koeritz <fred@gruntose.com>
Date: Thu, 23 Nov 2017 06:59:10 +0000 (-0500)
Subject: Merge branch 'dev' of feistymeow.org:feisty_meow into dev
X-Git-Tag: 2.140.106^2~34^2~26
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=641119ef73cf57ecd2c7be70c56ddb0998474450;p=feisty_meow.git

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

641119ef73cf57ecd2c7be70c56ddb0998474450