From: Chris Koeritz <fred@gruntose.com>
Date: Tue, 14 Nov 2017 14:40:14 +0000 (+0000)
Subject: Merge branch 'dev' of feistymeow.org:feisty_meow into dev
X-Git-Tag: 2.140.99^2~6^2~3
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=b35bab5fbd73cdb028bc8374b0980ec2c1dc58f4;p=feisty_meow.git

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

b35bab5fbd73cdb028bc8374b0980ec2c1dc58f4