Merge branch 'maint'

* maint:
  sha1_file: link() returns -1 on failure, not errno
  Make git archive respect core.autocrlf when creating zip format archives
  Add new test to demonstrate git archive core.autocrlf inconsistency
  gitweb: avoid warnings for commits without body
  Clarified gitattributes documentation regarding custom hunk header.
  git-svn: fix handling of even funkier branch names
  git-svn: Always create a new RA when calling do_switch for svn://
  git-svn: factor out svnserve test code for later use
  diff/diff-files: do not use --cc too aggressively

diff --cc Documentation/gitattributes.txt
Simple merge

diff --cc builtin-diff.c
Simple merge

diff --cc git-svn.perl
Simple merge

diff --cc gitweb/gitweb.perl
Simple merge

diff --cc sha1_file.c
Simple merge

diff --cc t/lib-git-svn.sh
Simple merge

diff --cc t/t9113-git-svn-dcommit-new-file.sh
Simple merge