Prevent pollution of the global namespace & properly quote variables
Merge branch 'master' of github.com:sdefresne/bash-git-prompt into sdefresne-master

# By Sylvain Defresne
# Via Sylvain Defresne
* 'master' of github.com:sdefresne/bash-git-prompt:
  Prevent pollution of the global namespace & properly quote variables

Conflicts:
	gitprompt.sh