Merge branch 'master' of feistymeow.org:feisty_meow
authorChris Koeritz <fred@gruntose.com>
Sun, 7 Jan 2018 16:29:57 +0000 (11:29 -0500)
committerChris Koeritz <fred@gruntose.com>
Sun, 7 Jan 2018 16:29:57 +0000 (11:29 -0500)

Trivial merge