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: (57 commits)
  gitweb: Better cutting matched string and its context
  Documentation/git-am.txt: Pass -r in the example invocation of rm -f .dotest
  timezone_names[]: fixed the tz offset for New Zealand.
  filter-branch documentation: non-zero exit status in command abort the filter
  rev-parse: fix potential bus error with --parseopt option spec handling
  Add tests for filesystem challenges (case and unicode normalization)
  Use a single implementation and API for copy_file()
  Documentation/git-filter-branch: add a new msg-filter example
  Correct fast-export file mode strings to match fast-import standard
  git-bundle.txt: Add different strategies to create the bundle
  builtin-for-each-ref.c: fix typo in error message
  send-email: test compose functionality
  t9001: enhance fake sendmail test harness
  diff --dirstat: saner handling of binary and unmerged files
  Be more verbose when checkout takes a long time
  Protect peel_ref fallback case from NULL parse_object result
  Ensure 'make dist' compiles git-archive.exe on Cygwin
  ws_fix_copy(): move the whitespace fixing function to ws.c
  gitweb: Fix bugs in git_search_grep_body: it's length(), not len()
  GIT 1.5.4.3
  ...