Merge branch 'master' of feistymeow.org:feisty_meow
authorChris Koeritz <fred@gruntose.com>
Sun, 12 Nov 2017 16:14:12 +0000 (16:14 +0000)
committerChris Koeritz <fred@gruntose.com>
Sun, 12 Nov 2017 16:14:12 +0000 (16:14 +0000)

Trivial merge