Fix typo
Merge branch 'master' of https://github.com/pschmitt/zsh

Conflicts:
	zprompt_LaXLinux