From: Chris Koeritz <fred@gruntose.com>
Date: Mon, 13 Nov 2017 23:48:15 +0000 (-0500)
Subject: Merge branch 'dev' of feistymeow.org:feisty_meow into dev
X-Git-Tag: 2.140.99^2~16
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=1d5f9eacb200d2dde200af0e2cc5185fdac8f541;p=feisty_meow.git

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

1d5f9eacb200d2dde200af0e2cc5185fdac8f541