ohmyzsh/templates
Jeffrey Horn 7bebacbb87 Merge SJL's fork with upstream
Merge branch 'master' of https://github.com/sjl/oh-my-zsh

Conflicts:
	README.textile
	lib/git.zsh
	oh-my-zsh.sh
2012-01-19 14:27:51 -05:00
..
zshrc.zsh-template Merge SJL's fork with upstream 2012-01-19 14:27:51 -05:00