Merge branch 'master' of git://git.kernel.org/pub/scm/git/git

Merge branch 'master' of git://git./git/git

* 'master' of git://git.kernel.org/pub/scm/git/git: (63 commits)
  Update draft release notes to 1.7.10
  Update draft release notes to 1.7.9.1
  Update draft release notes to 1.7.10
  add -e: do not show difference in a submodule that is merely dirty
  Prepare for 1.7.9.1
  completion: --edit and --no-edit for git-merge
  Git 1.7.6.6
  imap-send: remove dead code
  branch --edit-description: protect against mistyped branch name
  merge: do not create a signed tag merge under --ff-only option
  parse_date(): '@' prefix forces git-timestamp
  parse_date(): allow ancient git-timestamp
  git.spec: Workaround localized messages not put in any RPM
  t0300: use write_script helper
  tests: add write_script helper function
  vcs-svn: suppress a -Wtype-limits warning
  vcs-svn: allow import of > 4GiB files
  vcs-svn: rename check_overflow arguments for clarity
  i18n: format_tracking_info "Your branch is behind" message
  i18n: git-commit whence_s "merge/cherry-pick" message
  ...