Merge with upstream.

This commit is contained in:
Steve Losh 2011-06-03 16:25:32 -04:00
commit b17f99763d
97 changed files with 2632 additions and 128 deletions

2
.gitignore vendored
View file

@ -3,7 +3,7 @@ log/.zsh_history
projects.zsh
custom
custom/*.zsh
!custom/example.zsh
*.un~
cache
.DS_Store