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: (393 commits)
  config.txt: fix placement of diff.noprefix
  t/t4018: avoid two unnecessary sub-shell invocations
  t/t4018: test whether the word_regex patterns compile
  xdiff-interface.c: always trim trailing space from xfuncname matches
  diff.c: call regfree to free memory allocated by regcomp when necessary
  t/t5510-fetch.sh: improve testing with explicit URL and merge spec
  builtin/fetch.c: comment that branch->remote_name is usable when has_merge
  Makefile: use compat regex on IRIX 6.5
  t/t7008: workaround broken handling of \000 by printf on IRIX
  fast-export: ensure that a renamed file is printed after all references
  revert: Fix trivial comment style issue
  cache_tree_free: Fix small memory leak
  builtin/clean.c: Use STRING_LIST_INIT_NODUP.
  t3404 & t7508: cd inside subshell instead of around
  tag.c: whitespace breakages fix
  Fix whitespace issue in object.c
  t5505: add missing &&
  parse_object: pass on the original sha1, not the replaced one
  Git 1.7.2.3
  builtin/merge_recursive.c: Add an usage string and make use of it.
  ...