Sorin Ionescu 969553349f Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh ... Conflicts: .gitignore lib/completion.zsh lib/git.zsh oh-my-zsh.sh		2011-04-30 16:57:47 -04:00
..
zshrc.zsh-template	Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh	2011-04-30 16:57:47 -04:00