Merge branch 'master' of ssh://feistymeow.org/feisty_meow
authorChris Koeritz <fred@gruntose.com>
Tue, 8 Oct 2013 23:18:47 +0000 (19:18 -0400)
committerChris Koeritz <fred@gruntose.com>
Tue, 8 Oct 2013 23:18:47 +0000 (19:18 -0400)

Trivial merge