Merge remote-tracking branch 'upstream/master'

Conflicts:
	.gitignore
	.gitmodules
	README.textile
	completion.zsh
	history.zsh
This commit is contained in:
Justin Zhu 2012-03-06 13:52:40 -08:00
commit 8c6cbe115a
81 changed files with 4369 additions and 59 deletions

3
.gitmodules vendored
View file

@ -4,3 +4,6 @@
[submodule "plugins/zsh-history-substring-search"]
path = plugins/zsh-history-substring-search
url = git://github.com/sunaku/zsh-history-substring-search.git
[submodule "completions"]
path = completions
url = https://github.com/zsh-users/zsh-completions.git