merge upstream

This commit is contained in:
James Cox 2009-09-23 16:14:04 +01:00
commit 8a8a7bafa0
14 changed files with 16 additions and 6 deletions

2
.gitignore vendored
View file

@ -1,3 +1,5 @@
locals.zsh
log/.zsh_history
projects.zsh
custom/*.zsh
!custom/example.zsh