From: Chris Koeritz <fred@gruntose.com>
Date: Fri, 10 Nov 2017 20:33:10 +0000 (-0500)
Subject: Merge branch 'dev' of feistymeow.org:feisty_meow into dev
X-Git-Tag: 2.140.92^2~11
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=1d2664df2dfb6d3d0786706ce397acd86c2fbb13;p=feisty_meow.git

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

mergings
---

1d2664df2dfb6d3d0786706ce397acd86c2fbb13