Merge branch 'master' into next

Merge branch 'master' into next

* master:
  git svn: Doc update for multiple branch and tag paths
  git svn: cleanup t9138-multiple-branches
  gitweb/README: fix AliasMatch in example
  Test grep --and/--or/--not
  Test git archive --remote
  git-svn: Canonicalize svn urls to prevent libsvn assertion
  t9138: remove stray dot in test which broke bash
  git-svn: convert globs to regexps for branch destinations
  git svn: Support multiple branch and tag paths in the svn repository.
  Add 'git svn reset' to unwind 'git svn fetch'
  git-svn: speed up find_rev_before
  Add 'git svn help [cmd]' which works outside a repo.
  git-svn: let 'dcommit $rev' work on $rev instead of HEAD
  fread does not return negative on error
  builtin-remote: (get_one_entry): use strbuf
  t/t9001-send-email.sh: ensure generated script is executed with $SHELL_PATH