Merge branch 'master' of feistymeow.org:feisty_meow
authorChris Koeritz <fred@gruntose.com>
Sun, 26 Nov 2017 18:15:31 +0000 (13:15 -0500)
committerChris Koeritz <fred@gruntose.com>
Sun, 26 Nov 2017 18:15:31 +0000 (13:15 -0500)

Trivial merge