Merge branch 'master' of feistymeow.org:feisty_meow
authorChris Koeritz <fred@gruntose.com>
Sun, 12 Nov 2017 15:36:03 +0000 (10:36 -0500)
committerChris Koeritz <fred@gruntose.com>
Sun, 12 Nov 2017 15:36:03 +0000 (10:36 -0500)

Trivial merge