From: Chris Koeritz <fred@gruntose.com>
Date: Thu, 16 Nov 2017 23:25:03 +0000 (-0500)
Subject: Merge branch 'dev' of feistymeow.org:feisty_meow into dev
X-Git-Tag: 2.140.101^2~1^2~18
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=1524043ca2a7907e77a5f6b90527346d90f07d78;p=feisty_meow.git

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

1524043ca2a7907e77a5f6b90527346d90f07d78