From: Chris Koeritz <fred@gruntose.com>
Date: Sun, 12 Nov 2017 04:45:14 +0000 (-0500)
Subject: Merge branch 'dev' of feistymeow.org:feisty_meow into dev
X-Git-Tag: 2.140.98^2~27^2~1
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=24288284ed881f1b28e8bb15ad59ca2c50ea8f25;p=feisty_meow.git

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

24288284ed881f1b28e8bb15ad59ca2c50ea8f25