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: (128 commits)
  [PATCH] gitk: use user-configured background in view definition dialog
  [PATCH] gitk: Update German translation
  [PATCH] gitk: Update and fix Makefile
  git.el: Make status refresh faster.
  git.el: Refresh files from their real state upon commit.
  git.el: Make sure we never insert the same file twice.
  "git-apply --check" should not report "fixed"
  GIT 1.5.3.8
  Documentation: config: add 'help.*' and 'instaweb.*' variables.
  Allow git-mergetool to handle paths with a leading space
  git-svn: clarify the "Ignoring error from SVN" piece
  git-svn: support for funky branch and project names over HTTP(S)
  slightly better auto gc message
  Documentation: typofix
  Update draft release notes for 1.5.4
  diff: do not chomp hunk-header in the middle of a character
  utf8_width(): allow non NUL-terminated input
  utf8: pick_one_utf8_char()
  git.el: Display file types and type changes.
  git.el: Retrieve the permissions for up-to-date files.
  ...

Conflicts:

	Documentation/git-reflog.txt (origin version)