Merge branch 'master' of git://github.com/robbyrussell/oh-my-zsh
Merge branch 'master' of github.com:bcap/oh-my-zsh