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: (197 commits)
  git-reset: do not be confused if there is nothing to reset
  git-clone: honor "--" to end argument parsing
  RelNotes-1.5.3.5: fix typo
  git-svn: sort the options in the --help message.
  builtin-fetch: Add "-q" as a synonym for "--quiet"
  Delay pager setup in git blame
  git-cvsimport: really convert underscores in branch names to dots with -u
  errors: "strict subset" -> "ancestor"
  git-fetch: more terse fetch output
  gitweb: Use config file for repository description and URLs
  gitweb: Read repo config using 'git config -z -l'
  gitweb: Add tests for overriding gitweb config with repo config
  test format-patch -s: make sure MIME content type is shown as needed
  cherry-pick/revert -m: add tests
  Fixing path quoting in git-rebase
  Remove unecessary hard-coding of EDITOR=':' VISUAL=':' in some test suites.
  Documentation: quote commit messages consistently.
  Remove escaping of '|' in manpage option sections
  transport.c: squelch a gcc 4.0.1 complaint about an uninitialized variable
  Make mailsplit and mailinfo strip whitespace from the start of the input
  ...