Merge branch 'master' of feistymeow.org:feisty_meow
authorChris Koeritz <fred@gruntose.com>
Thu, 21 Dec 2017 18:14:11 +0000 (18:14 +0000)
committerChris Koeritz <fred@gruntose.com>
Thu, 21 Dec 2017 18:14:11 +0000 (18:14 +0000)

Trivial merge