From: Chris Koeritz <fred@gruntose.com>
Date: Mon, 13 Nov 2017 00:21:03 +0000 (-0500)
Subject: Merge branch 'master' of feistymeow.org:feisty_meow into dev
X-Git-Tag: 2.140.98^2~5
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;ds=inline;h=e855cd6aa2d75a11b18c923f9c9ceed8c59ce94a;p=feisty_meow.git

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

e855cd6aa2d75a11b18c923f9c9ceed8c59ce94a