From: Chris Koeritz <fred@gruntose.com>
Date: Tue, 14 Nov 2017 14:18:57 +0000 (-0500)
Subject: Merge branch 'dev' of feistymeow.org:feisty_meow into dev
X-Git-Tag: 2.140.99^2~3^2~1
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=445830cea59cd440fcb81254b4600545b1cbe581;p=feisty_meow.git

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

445830cea59cd440fcb81254b4600545b1cbe581