Merge branch 'master' of github.com:lorrin/oh-my-zsh

Conflicts:
	plugins/command-not-found/command-not-found.plugin.zsh
This commit is contained in:
Lorrin Nelson 2011-02-07 23:31:17 -08:00
commit 7d00b1b8b1

Diff content is not available