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

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

d10e9b8bbf0a9a26587abbd6158036b7096112d3