Merge branch 'master' of feistymeow.org:feisty_meow
authorChris Koeritz <fred@gruntose.com>
Thu, 21 Dec 2017 17:37:01 +0000 (12:37 -0500)
committerChris Koeritz <fred@gruntose.com>
Thu, 21 Dec 2017 17:37:01 +0000 (12:37 -0500)

Trivial merge