Sync with 1.7.6.6

* maint-1.7.8:
  Git 1.7.6.6
  imap-send: remove dead code

diff --cc Documentation/git.txt
Simple merge

diff --cc imap-send.c
Simple merge