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: (373 commits)
  GIT 1.5.3
  Mention -m as an abbreviation for --merge
  Update my contact address as the maintainer.
  Documentation: minor AsciiDoc mark-up fixes.
  URL: allow port specification in ssh:// URLs
  Avoid one-or-more (\+) non BRE in sed scripts.
  rebase -m: Fix incorrect short-logs of already applied commits.
  git-diff: resurrect the traditional empty "diff --git" behaviour
  git-tag: Fix -l option to use better shell style globs.
  git-svn: fix dcommit clobbering upstream when committing multiple changes
  git-svn: Protect against "diff.color = true".
  filter-branch: introduce convenience function "skip_commit"
  filter-branch: provide the convenience functions also for commit filters
  rebase -i: mention the option to split commits in the man page
  filter-branch: fix remnants of old syntax in documentation
  Teach bash about completing arguments for git-tag
  Hopefully the final update to draft release notes for 1.5.3.
  Make "git-log --" without paths behave the same as "git-log" without --
  git-init: autodetect core.symlinks
  Make git-archimport log entries more consistent
  ...

Conflicts:

	Documentation/git-add.txt