Merge branch 'master' of feistymeow.org:feisty_meow
authorChris Koeritz <fred@gruntose.com>
Fri, 10 Nov 2017 23:59:29 +0000 (23:59 +0000)
committerChris Koeritz <fred@gruntose.com>
Fri, 10 Nov 2017 23:59:29 +0000 (23:59 +0000)

Trivial merge