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: (1398 commits)
  Git 1.8.1-rc1
  Documentation/diff-config: work around AsciiDoc misfortune
  Update draft release notes to 1.8.0.2
  l10n: de.po: translate 22 new messages
  l10n: de.po: translate 825 new messages
  document that statusHints affects git checkout
  Git 1.8.1-rc0
  status: respect advice.statusHints for ahead/behind advice
  t4041 (diff-submodule-option): modernize style
  t4041 (diff-submodule-option): rewrite add_file() routine
  t4041 (diff-submodule-option): parse digests sensibly
  l10n: Update Swedish translation (1979t0f0u)
  l10n: vi.po: update to git-v1.8.0.1-347-gf94c3
  l10n: Update git.pot (5 new, 1 removed messages)
  Update draft release notes to 1.8.1
  git-fast-import.txt: improve documentation for quoted paths
  git-remote-mediawiki: escape ", \, and LF in file names
  t4049: refocus tests
  completion: fix warning for zsh
  Update draft release notes to 1.8.1
  ...

Conflicts:
	Documentation/gitignore.txt