Merge branch 'master' of feistymeow.org:feisty_meow
authorChris Koeritz <fred@gruntose.com>
Sat, 11 Nov 2017 03:44:55 +0000 (22:44 -0500)
committerChris Koeritz <fred@gruntose.com>
Sat, 11 Nov 2017 03:44:55 +0000 (22:44 -0500)

Trivial merge