Merge branch 'master' of git://feistymeow.org/feisty_meow
authorChris Koeritz <fred@gruntose.com>
Sat, 11 Nov 2017 20:47:24 +0000 (15:47 -0500)
committerChris Koeritz <fred@gruntose.com>
Sat, 11 Nov 2017 20:47:24 +0000 (15:47 -0500)

Trivial merge