From: Chris Koeritz <fred@gruntose.com>
Date: Sat, 11 Nov 2017 22:25:26 +0000 (-0500)
Subject: Merge branch 'dev' of feistymeow.org:feisty_meow into dev
X-Git-Tag: 2.140.98^2~33^2~1
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=1fdbf6ca82b7223b3c1fd16dfd86c9b395399443;p=feisty_meow.git

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

1fdbf6ca82b7223b3c1fd16dfd86c9b395399443