Convert tabs to spaces
Only one newline at end of file
[Fix #595] Simplify the handling of the Terminal.app proxy icon
Merge branch 'master' of github.com:sorin-ionescu/prezto

Conflicts:
	runcoms/zshrc