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: (111 commits)
  Git 1.7.0.2
  unset GREP_OPTIONS in test-lib.sh
  stash: suggest the correct command line for unknown options.
  t7406: Fix submodule init config tests
  git-svn: make git svn --version work again
  Revert "git-svn: always initialize with core.autocrlf=false"
  git-svn: support fetch with autocrlf on
  hash-object: support --stdin-paths with --no-filters
  Update draft release notes to 1.7.0.2
  Remove extra '-' from git-am(1)
  t9119-git-svn-info.sh: test with svn 1.6.* as well
  git-svn: req_svn when needed
  run-command.c: fix build warnings on Ubuntu
  submodule summary: do not shift a non-existent positional variable
  Start preparing for 1.7.0.2
  fallback SSH_ASKPASS when GIT_ASKPASS not set
  gitweb: Fix project-specific feature override behavior
  gitweb multiple project roots documentation
  bisect: error out when passing bad path parameters
  Git 1.7.0.1
  ...