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

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

98bda03773801b2fc42fc2e6cfd6895576ee5685