Merge branch 'master' of feistymeow.org:feisty_meow
authorChris Koeritz <fred@gruntose.com>
Sun, 6 May 2018 01:37:01 +0000 (21:37 -0400)
committerChris Koeritz <fred@gruntose.com>
Sun, 6 May 2018 01:37:01 +0000 (21:37 -0400)

Trivial merge