Merge branch 'master' of feistymeow.org:feisty_meow
authorChris Koeritz <fred@gruntose.com>
Fri, 10 Nov 2017 20:35:27 +0000 (15:35 -0500)
committerChris Koeritz <fred@gruntose.com>
Fri, 10 Nov 2017 20:35:27 +0000 (15:35 -0500)

Trivial merge