Merge branch 'origin'

Merge branch 'origin'

* origin: (81 commits)
  Teach diff to imply --find-copies-harder upon -C -C
  Remove trailing slash from $(template_dir).
  Avoid double-slash in path names that depend on $(sharedir).
  Unquote From line from patch before comparing with given from address.
  git-cherry: Document 'limit' command-line option
  git-gui: Save geometry before the window layout is damaged
  git-gui: Give amend precedence to HEAD over MERGE_MSG
  git-gui: Include 'war on whitespace' fixes from git.git
  gitweb: '--cc' for merges in 'commitdiff' view
  gitweb: Add links to blobdiffs in from-file/to-file header for merges
  gitweb: Create special from-file/to-file header for combined diff
  gitweb: Split git_patchset_body into separate subroutines
  gitweb: Improve "next" link in commitdiff view
  gitweb: Provide links to commitdiff to each parent in 'commitdiff' view
  mktag: minimally update the description.
  Makefile: add an explicit rule for building assembly output
  tutorial: use "project history" instead of "changelog" in header
  Documentation: user-manual todo
  user-manual: add a missing section ID
  Fix typo in remote branch example in git user manual
  ...