Merge branch 'master' of git.ganneff.de:zsh-ganneff
drwxr-xr-x - .zsh