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: (37 commits)
  test: skip clean-up when running under --immediate mode
  "branch -d" can remove more than one branches
  git-svn: Correctly handle root commits in mergeinfo ranges
  git-svn: Disambiguate rev-list arguments to improve error message
  git-svn: Demonstrate a bug with root commits in mergeinfo ranges
  git-instaweb: Check that correct config file exists for (re)start
  git-instaweb: Move all actions at the end of script
  git-instaweb: Use $conf, not $fqgitdir/gitweb/httpd.conf
  git-instaweb: Extract configuring web server into configure_httpd
  Git 1.7.6
  completion: replace core.abbrevguard to core.abbrev
  verify_dotfile(): do not assume '/' is the path seperator
  verify_path(): simplify check at the directory boundary
  Windows: teach getenv to do a case-sensitive search
  mingw.c: move definition of mingw_getenv down
  sh-i18n--envsubst: do not crash when no arguments are given
  checkout -b <name>: correctly detect existing branch
  grep: add --heading
  grep: add --break
  grep: fix coloring of hunk marks between files
  ...