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: (39 commits)
  Documentation: clarify tutorial pull/merge discussion
  gitweb: Make project description in projects list link to summary view
  git-svn: allow SVN:: lib users to track the root of the repository (again)
  gitweb: Use author_epoch for pubdate in gitweb feeds
  gitweb: Add author and contributor email to Atom feed
  gitweb: Add author and committer email extraction to parse_commit
  gitweb: Use git-show-ref instead of git-peek-remote
  gitweb: Do not use esc_html in esc_path
  git-fetch: exit with non-zero status when fast-forward check fails
  git-svn: exit with status 1 for test failures
  git-svn: correctly access repos when only given partial read permissions
  git-branch -D: make it work even when on a yet-to-be-born branch
  Add -v and --abbrev options to git-branch
  git-clone: stop dumb protocol from copying refs outside heads/ and tags/.
  gitweb: (style) use chomp without parentheses consistently.
  gitweb: Replace SPC with   also in tag comment
  Typefix builtin-prune.c::prune_object()
  config option log.showroot to show the diff of root commits
  git-svn: handle authentication without relying on cached tokens on disk
  git-cvsimport: add support for CVS pserver method HTTP/1.x proxying
  ...