Merge branch 'master' of feistymeow.org:feisty_meow
authorChris Koeritz <fred@gruntose.com>
Mon, 11 Dec 2017 17:31:36 +0000 (12:31 -0500)
committerChris Koeritz <fred@gruntose.com>
Mon, 11 Dec 2017 17:31:36 +0000 (12:31 -0500)

Trivial merge