From: Chris Koeritz <fred@gruntose.com>
Date: Sat, 11 Nov 2017 06:07:01 +0000 (-0500)
Subject: Merge branch 'master' of feistymeow.org:feisty_meow into dev
X-Git-Tag: 2.140.96^2~6
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=dfb61170276cb54900073208d1b843acad51ea04;p=feisty_meow.git

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

getting synched
---

dfb61170276cb54900073208d1b843acad51ea04