Merge branch 'master' of https://github.com/olivierverdier/zsh-git-prompt

Conflicts:
	gitstatus.py