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:
  Git 1.7.9.3
  fsck doc: a minor typofix
  fast-import: zero all of 'struct tag' to silence valgrind
  Update draft release notes to 1.7.10
  Update draft release notes to 1.7.9.3 for the last time
  http.proxy: also mention https_proxy and all_proxy
  parse-options: typo check for unknown switches
  t0300: work around bug in dash 0.5.6
  t5512 (ls-remote): modernize style
  gitweb: Fix passing parameters to git_project_search_form
  tests: fix spurious error when run directly with Solaris /usr/xpg4/bin/sh
  symbolic-ref --short: abbreviate the output unambiguously
  test: "am -3" can accept non-standard -p<num>
  gitweb: Highlight matched part of shortened project description
  gitweb: Highlight matched part of project description when searching projects
  gitweb: Highlight matched part of project name when searching projects
  gitweb: Introduce esc_html_match_hl and esc_html_hl_regions
  am -3: allow nonstandard -p<num> option