PS1 compatible with git 1.7 and 1.8
Merge branch 'master' of github.com:fabiocerqueira/dotfiles