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

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

b3260afc3a9ec1b5df9551de6f73a7a81c5f210c