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: (322 commits)
  gitweb: Change to use explicitly function call cgi->escapHTML()
  git-bundle: fix pack generation.
  git-gui: Make 'make' quieter by default
  git-commit: cd to top before showing the final stat
  Fix diff-options references in git-diff and git-format-patch
  Add definition of <commit-ish> to the main git man page.
  Begin SubmittingPatches with a check list
  fast-import: Fail if a non-existant commit is used for merge
  fast-import: Avoid infinite loop after reset
  contrib/emacs: Use non-interactive function to byte-compile files
  t/t5515-fetch-merge-logic.sh: Added tests for the merge login in git-fetch
  Post 1.5.0.3 cleanup
  GIT 1.5.0.3
  glossary: Add definitions for dangling and unreachable objects
  user-manual: more detailed merge discussion
  user-manual: how to replace commits older than most recent
  user-manual: insert earlier of mention content-addressable architecture
  user-manual: ensure generated manual references stylesheet
  user-manual: reset to ORIG_HEAD not HEAD to undo merge
  Documentation: mention module option to git-cvsimport
  ...