Merge branch 'master' of feistymeow.org:feisty_meow
authorChris Koeritz <fred@gruntose.com>
Tue, 19 Dec 2017 20:36:29 +0000 (15:36 -0500)
committerChris Koeritz <fred@gruntose.com>
Tue, 19 Dec 2017 20:36:29 +0000 (15:36 -0500)

Trivial merge