Merge branch 'master' of feistymeow.org:feisty_meow
authorChris Koeritz <fred@gruntose.com>
Tue, 17 Sep 2013 18:28:48 +0000 (14:28 -0400)
committerChris Koeritz <fred@gruntose.com>
Tue, 17 Sep 2013 18:28:48 +0000 (14:28 -0400)

Trivial merge