Merge branch 'master' of github.com:diogro/oh-my-zsh into local
Merge branch 'local' of github.com:diogro/oh-my-zsh into local
Merge branch 'master' of github.com:diogro/oh-my-zsh into local
Merge branch 'local' of github.com:diogro/oh-my-zsh into local