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

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

df98e9588b5e6e9ca425387f9f976cb616cd7edc