Merge branch 'master' of gitosis@majnematic.com:davesdots

Conflicts:
	zsh/.gitignore
This commit is contained in:
David Alexander Majnemer 2009-01-14 03:00:40 -05:00
commit a413c77c3b

1
zsh/.gitignore vendored
View file

@ -1,2 +1,3 @@
.history
.zcompdump*
.*-cache