Merge branch 'fl/askpass'

* fl/askpass:
  git-core: Support retrieving passwords with GIT_ASKPASS
  git-svn: Support retrieving passwords with GIT_ASKPASS

diff --cc cache.h
Simple merge

diff --cc connect.c
Simple merge

diff --cc git-svn.perl
Simple merge

diff --cc imap-send.c
Simple merge