Merge branch 'maint'

* maint:
  GIT 1.6.0.5
  "git diff <tree>{3,}": do not reverse order of arguments
  tag: delete TAG_EDITMSG only on successful tag
  gitweb: Make project specific override for 'grep' feature work
  http.c: use 'git_config_string' to get 'curl_http_proxy'
  fetch-pack: Avoid memcpy() with src==dst

diff --cc builtin-fetch-pack.c
Simple merge

diff --cc builtin-tag.c
Simple merge

diff --cc gitweb/gitweb.perl
Simple merge

diff --cc http.c
Simple merge