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: (28 commits)
  git-apply: prepare for upcoming GNU diff -u format change.
  Don't use $author_name undefined when $from contains no /\s</.
  Add revspec documentation for ':path', ':[0-3]:path' and git-describe
  Reject hexstring longer than 40-bytes in get_short_sha1()
  reduce delta head inflated size
  git-imap-send: Strip smtp From_ header from imap message.
  add proper dependancies on the xdiff source
  bisect reset: Leave the tree in usable state if git-checkout failed
  diff --numstat
  gitweb: Fix search form when PATH_INFO is enabled
  Add --dry-run option to git-send-email
  git-svnimport.perl: copying directory from original SVN place
  Make git-send-email detect mbox-style patches more readily
  git-archive --format=zip: add symlink support
  git-archive --format=zip: use default version ID
  gitweb: Document features better
  git-send-email: real name with period need to be dq-quoted on From: line
  git-send-email: do not drop custom headers the user prepared
  Turn on recursive with --summary
  gitweb: warn if feature cannot be overridden.
  ...