Merge branch 'gr/cvsimport-alternative-cvspass-location' into maint
commit978471dccec18daab3165c60a90ad59cbdb43723
authorJunio C Hamano <gitster@pobox.com>
Fri, 13 May 2011 17:44:54 +0000 (13 10:44 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 13 May 2011 17:44:54 +0000 (13 10:44 -0700)
treec34d4e75afbd01fecb14e046ecb004a1d6e91ede
parente82c74618b24ddaad56f085f66c90da7ad7a0cb5
parent58fdef0cff5bcf10f2621d00466b33a5b8a39bf7
Merge branch 'gr/cvsimport-alternative-cvspass-location' into maint

* gr/cvsimport-alternative-cvspass-location:
  Look for password in both CVS and CVSNT password files.
git-cvsimport.perl