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:
  Documentation: update git-clone man page with new behavior
  cvsserver: Avoid miscounting bytes in Perl v5.8.x
  change the unpack limit treshold to a saner value
  Documentation: reorganize cvs-migration.txt
  git-merge: fix "fix confusion between tag and branch" for real
  git-svn: avoid network timeouts for long-running fetches
  gitweb: Allow PNG, GIF, JPEG images to be displayed in "blob" view
  git-merge: squelch needless error message.
  git-reset to remove "$GIT_DIR/MERGE_MSG"
  cvs-migration: improved section titles, better push/commit explanation
  cvs-migration document: make the need for "push" more obvious
  Document git-diff whitespace flags -b and -w
  diff -b: ignore whitespace at end of line
  unpack-trees: make sure "df_conflict_entry.name" is NUL terminated.
  Use .git/config for storing "origin" shortcut repository