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

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

6820b15014fb72fc7f6fc30ae8d32e69e5ee13d2