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

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

7dc58bafd595428e77ca553719ed4ecbcf769086