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: (21 commits)
  git-branch --track: fix tracking branch computation.
  Fix typo in git-mergetool
  Add the --numbered-files option to git-format-patch.
  $EMAIL is a last resort fallback, as it's system-wide.
  make clean should remove all the test programs too
  add git-filter-branch to .gitignore
  merge-recursive: refuse to merge binary files
  Move buffer_is_binary() to xdiff-interface.h
  git-fsck: learn about --verbose
  gitweb: Handle non UTF-8 text better
  Add test-sha1 to .gitignore.
  Teach git-tag about showing tag annotations.
  git-apply: what is detected and fixed is not just trailing spaces.
  Update to SubmittingPatches
  Release Notes: start preparing for 1.5.3
  GIT 1.5.2.1
  Unify write_index_file functions
  Add basic test-script for git-submodule
  Add git-submodule command
  Remove git-applypatch
  ...