Merge branch 'master' of feistymeow.org:feisty_meow
authorChris Koeritz <fred@gruntose.com>
Tue, 19 Dec 2017 14:14:13 +0000 (14:14 +0000)
committerChris Koeritz <fred@gruntose.com>
Tue, 19 Dec 2017 14:14:13 +0000 (14:14 +0000)

Trivial merge