replace fetch + merge with git pull
to silence warning about misalignment of class-end declaration
ooops missed to commit lib changes
Merge branch 'master' of git://github.com/mikemallete/ruby-git into pull-fix