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: (305 commits)
  daemon: support <directory> arguments again
  Fix typos in the documentation
  gitweb: skip logo in atom feed when there is none
  t9001: Fix test prerequisites
  Git 1.7.4-rc0
  Prepare for 1.7.3.5
  t9001: use older Getopt::Long boolean prefix '--no' rather than '--no-'
  Fix false positives in t3404 due to SHELL=/bin/false
  setup_work_tree: adjust relative $GIT_WORK_TREE after moving cwd
  close file on error in read_mmfile()
  Makefile: add NO_FNMATCH_CASEFOLD to IRIX sections
  test-lib.sh/test_decode_color(): use octal not hex in awk script
  rebase --skip: correctly wrap-up when skipping the last patch
  git.txt: correct where --work-tree path is relative to
  Revert "Documentation: always respect core.worktree if set"
  t0001: test git init when run via an alias
  Remove all logic from get_git_work_tree()
  setup: rework setup_explicit_git_dir()
  setup: clean up setup_discovered_git_dir()
  t1020-subdirectory: test alias expansion in a subdirectory
  ...

Conflicts:
	Documentation/gitignore.txt