update Git
Merge branch 'master' of git://github.com/phprock/rock