Merge branch 'master' of feistymeow.org:feisty_meow
authorChris Koeritz <fred@gruntose.com>
Tue, 14 Nov 2017 14:59:10 +0000 (09:59 -0500)
committerChris Koeritz <fred@gruntose.com>
Tue, 14 Nov 2017 14:59:10 +0000 (09:59 -0500)

Trivial merge