Merge branch 'master' of github.com:erynofwales/dotfiles

Conflicts:
	zshrc
This commit is contained in:
Eryn Wells 2012-04-17 22:34:55 -07:00
commit 637fb20384
11 changed files with 343 additions and 267 deletions

@ -1 +1 @@
Subproject commit c6b09594a9c78df92245d60faf37a43fbb4853e8
Subproject commit f5a75d075d3c005ebe69e3f5e56cf99516e8aa3b