Merge branch 'master' of github.com:aks/bash-git-prompt

Conflicts:
	README.md
	git-prompt-colors.sh
	gitprompt.sh
master
Alan Stebbens 11 years ago
commit 45737de945

Diff Content Not Available