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: (45 commits)
  annotate: fix for cvsserver.
  gitweb: fix mismatched parenthesis
  git-push: allow globbing wildcard refspec.
  bash: Complete git-remote subcommands.
  bash: Support git-rebase -m continuation completion.
  Fix longstanding mismerge of ALL_CFLAGS vs BASIC_CFLAGS
  pager: Work around window resizing bug in 'less'
  Teach git-remote add to fetch and track
  blame: document --contents option
  Use pretend_sha1_file() in git-blame and git-merge-recursive.
  Add pretend_sha1_file() interface.
  git-blame: no rev means start from the working tree file.
  git-blame: an Emacs minor mode to view file with git-blame output.
  Allow forcing of a parent commit, even if the parent is not a direct one.
  bisect: it needs to be done in a working tree.
  Commands requiring a work tree must not run in GIT_DIR
  Add hg-to-git conversion utility.
  blameview: Support browsable functionality to blameview.
  gitweb: Convert project name to UTF-8
  bash: Support git-bisect and its subcommands.
  ...