Merge branch 'master' of feistymeow.org:feisty_meow
authorChris Koeritz <fred@gruntose.com>
Sun, 17 Dec 2017 20:14:10 +0000 (20:14 +0000)
committerChris Koeritz <fred@gruntose.com>
Sun, 17 Dec 2017 20:14:10 +0000 (20:14 +0000)

Trivial merge