Merge branch 'wting.zsh-theme' of github.com:wting/oh-my-zsh into wting.zsh-theme

Conflicts:
	themes/wting.zsh-theme
This commit is contained in:
William Ting 2012-04-15 19:39:34 -10:00
commit 1cb3a8d5af

Diff content is not available