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

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

ccf15a3d7de87085bbdbb2f1f3aa21f58324a045