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

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

15c4171d9c405e62dbb29b1937861201473e6517