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

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

c76d8a38f95773c4d558cc34d9e6903d0b2042cf