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

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

646b342a648564d0a6e3e2f10683fc7f04204370