From: Chris Koeritz <fred@gruntose.com>
Date: Tue, 14 Nov 2017 23:21:19 +0000 (-0500)
Subject: Merge branch 'dev' of feistymeow.org:feisty_meow into dev
X-Git-Tag: 2.140.100^2~13^2
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=e6f154b7694e7b033f8f44a0cfae6bc6bab65039;hp=--cc;p=feisty_meow.git

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

e6f154b7694e7b033f8f44a0cfae6bc6bab65039