From: Chris Koeritz <fred@gruntose.com>
Date: Wed, 20 Dec 2017 01:52:02 +0000 (-0500)
Subject: Merge branch 'dev' of feistymeow.org:feisty_meow into dev
X-Git-Tag: 2.140.107^2~2^2~13
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=16f24ee42bcf19edc0b92933ec26f70222fa4fa6;p=feisty_meow.git

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

16f24ee42bcf19edc0b92933ec26f70222fa4fa6