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: (74 commits)
  Update draft release notes to 1.7.10
  merge: add instructions to the commit message when editing
  completion: --edit and --no-edit for git-merge
  Kick off the post 1.7.9 cycle
  Git 1.7.9
  i18n: Do not force USE_GETTEXT_SCHEME=fallthrough on NO_GETTEXT
  INSTALL: warn about recent Fedora breakage
  git-completion: workaround zsh COMPREPLY bug
  t9801: do not overuse test_must_fail
  git-p4: Change p4 command invocation
  git-p4: Add test case for complex branch import
  git-p4: Search for parent commit on branch creation
  docs: minor grammar fixes for v1.7.9 release notes
  submodule add: fix breakage when re-adding a deep submodule
  clone: fix up delay cloning conditions
  push: do not let configured foreign-vcs permanently clobbered
  merge: use editor by default in interactive sessions
  i18n: Make NO_GETTEXT imply fallthrough scheme in shell l10n
  add a Makefile switch to avoid gettext translation in shell scripts
  git-sh-i18n: restructure the logic to compute gettext.sh scheme
  ...