Merge branch 'master' of feistymeow.org:feisty_meow
authorChris Koeritz <fred@gruntose.com>
Sat, 6 Jan 2018 19:49:39 +0000 (14:49 -0500)
committerChris Koeritz <fred@gruntose.com>
Sat, 6 Jan 2018 19:49:39 +0000 (14:49 -0500)

Trivial merge