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

Merge branch 'master' of git://feistymeow.org/feisty_meow

getting to local master
---

48eec5d644912678bee5bca536e37ecf63249faf