Merge branch 'master' of feistymeow.org:feisty_meow
authorChris Koeritz <fred@gruntose.com>
Sat, 17 Sep 2016 22:58:03 +0000 (18:58 -0400)
committerChris Koeritz <fred@gruntose.com>
Sat, 17 Sep 2016 22:58:03 +0000 (18:58 -0400)

Trivial merge