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: (219 commits)
  Update draft release notes for 1.6.0
  bash completion: Don't offer "a.." as a completion for "a."
  git-request-pull: replace call to deprecated peek-remote
  Make rebase--interactive use OPTIONS_SPEC
  t3404: test two "preserve merges with -p" cases
  git-am/git-mailsplit: correct synopsis for reading from stdin
  GIT 1.5.6.3
  git-am: Do not exit silently if committer is unset
  bash completion: Improve responsiveness of git-log completion
  t0004: fix timing bug
  git-mailinfo: document the -n option
  Fix backwards-incompatible handling of core.sharedRepository
  apply: fix copy/rename breakage
  git-send-email: Fix authenticating on some servers when using TLS.
  revisions: refactor handle_revision_opt into parse_revision_opt.
  git-shortlog: migrate to parse-options partially.
  git-blame: fix lapsus
  Provide fallback definitions of PRIu32 and PRIx32
  t9100-git-svn-basic.sh: Fix determination of utf-8 locale
  t9113-*.sh: provide user feedback when test skipped
  ...

Conflicts:

	t/t9700-perl-git.sh (resolved to 'origin' version)