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: (105 commits)
  is_submodule_modified(): fix breakage with external GIT_INDEX_FILE
  RPM packaging: don't include foreign-scm-helper bits yet
  grep: Fix two memory leaks
  rebase: don't invoke the pager for each commit summary
  Update draft release notes to 1.7.0
  Implement pthread_cond_broadcast on Windows
  If deriving SVN_SSH from GIT_SSH on msys, also add quotes
  add shebang line to git-mergetool--lib.sh
  fix off-by-one allocation error
  fix memcpy of overlapping area
  gitk: Update German translation
  gitk: Add French translation
  gitk: update Italian translation
  gitk: Update Swedish translation
  bash: support 'git notes' and its subcommands
  bash: don't offer remote transport helpers as subcommands
  grep --quiet: finishing touches
  reject @{-1} not at beginning of object name
  fix parsing of @{-1}@{u} combination
  test combinations of @{} syntax
  ...