Convert tabs to spaces
Only one newline at end of file
[Fix #595] Simplify the handling of the Terminal.app proxy icon
Merge remote-tracking branch 'upstream/master'

Conflicts:
	runcoms/zlogin
	runcoms/zlogout
	runcoms/zshrc