Merge branch 'master' of feistymeow.org:feisty_meow
authorChris Koeritz <fred@gruntose.com>
Sun, 12 Nov 2017 23:41:47 +0000 (18:41 -0500)
committerChris Koeritz <fred@gruntose.com>
Sun, 12 Nov 2017 23:41:47 +0000 (18:41 -0500)

Trivial merge