From: Chris Koeritz <fred@gruntose.com>
Date: Fri, 17 Nov 2017 14:35:23 +0000 (+0000)
Subject: Merge branch 'dev' of feistymeow.org:feisty_meow into dev
X-Git-Tag: 2.140.101^2~1^2~4^2
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=acf77170cedaa7e42768879fcec435003b1610fd;p=feisty_meow.git

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

acf77170cedaa7e42768879fcec435003b1610fd