Merge branch 'master' of git://feistymeow.org/feisty_meow
authorChris Koeritz <fred@gruntose.com>
Sat, 11 Nov 2017 17:26:01 +0000 (12:26 -0500)
committerChris Koeritz <fred@gruntose.com>
Sat, 11 Nov 2017 17:26:01 +0000 (12:26 -0500)
getting to local master


Trivial merge