Merge branch 'mv/format-cc'

* mv/format-cc:
  Add tests for sendemail.cc configuration variable
  git-send-email: add a new sendemail.cc configuration variable
  git-format-patch: add a new format.cc configuration variable

diff --cc Documentation/git-format-patch.txt
Simple merge

diff --cc builtin-log.c
Simple merge