Merge branch 'am/completion-zsh-fix'

* am/completion-zsh-fix: contrib/completion: "local var=()" is misinterpreted as func-decl by zsh

Junio C Hamano committed Mar 23, 2012 at 14:36 UTC f47ff5afe4208488c6f977b497b81acdce941afc

No changes.