From: Chris Koeritz <fred@gruntose.com>
Date: Wed, 3 Jan 2018 16:57:53 +0000 (-0500)
Subject: Merge branch 'dev' of feistymeow.org:feisty_meow into dev
X-Git-Tag: 2.140.107^2~2^2~10^2
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=3b7dede4665905a531d84628099ed1f9714a512e;p=feisty_meow.git

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

3b7dede4665905a531d84628099ed1f9714a512e