Merge branch 'master' of feistymeow.org:feisty_meow
authorChris Koeritz <fred@gruntose.com>
Mon, 6 Nov 2017 22:44:22 +0000 (22:44 +0000)
committerChris Koeritz <fred@gruntose.com>
Mon, 6 Nov 2017 22:44:22 +0000 (22:44 +0000)

Trivial merge