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: (144 commits)
  Update draft release notes to 1.6.3
  test-lib: Clean up comments and Makefile.
  rebase: fix typo (force_rebas -> force-rebas)
  builtin-send-pack.c: avoid empty structure initialization
  Grammar fix for "git merge" man page
  documentation: update cvsimport description of "-r" for recent clone
  fast-export: Avoid dropping files from commits
  Documentation: Remove spurious uses of "you" in git-bisect.txt.
  Grammar fixes to "merge" and "patch-id" docs
  Correct missing SP characters in grammar comment at top of fast-import.c
  git-filter-branch: avoid collisions with variables in eval'ed commands
  builtin-push.c: Fix typo: "anythig" -> "anything"
  t7502-commit: Skip SIGTERM test on Windows
  t7005-editor: Use $SHELL_PATH in the editor scripts
  diff --no-index: Do not generate patch output if other output is requested
  Guard a few Makefile variables against user environments
  Add warning about known issues to documentation of cvsimport
  completion: add --thread=deep/shallow to format-patch
  completion: add --cc and --no-attachment option to format-patch
  completion: add --annotate option to send-email
  ...