Merge branch 'master' of feistymeow.org:feisty_meow
authorChris Koeritz <fred@gruntose.com>
Wed, 3 Aug 2016 22:31:39 +0000 (18:31 -0400)
committerChris Koeritz <fred@gruntose.com>
Wed, 3 Aug 2016 22:31:39 +0000 (18:31 -0400)

Trivial merge