Merge branch 'master' of feistymeow.org:feisty_meow
authorChris Koeritz <fred@gruntose.com>
Sun, 3 Dec 2017 06:02:43 +0000 (01:02 -0500)
committerChris Koeritz <fred@gruntose.com>
Sun, 3 Dec 2017 06:02:43 +0000 (01:02 -0500)

Trivial merge