Merge branch 'master' of https://github.com/progit/progit
Merge branch 'HEAD' of git@github.com:pepr/progit.git