Sync with maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 3 May 2013 22:17:38 +0000 (15:17 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 3 May 2013 22:17:38 +0000 (15:17 -0700)
* maint:
completion: zsh: don't override suffix on _detault
Documentation/git-commit: Typo under --edit

Trivial merge