gitstatus compatibility with python 3
fixed compatibility issue with python 2.5 and 2.6
merged
Merge branch 'master' of github.com:Onizuka89/oh-my-zsh

Conflicts:
	plugins/git-prompt/gitstatus.py