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

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

7d0b5833568389c06ff6d9871da343a1e3e374fe