Merge branch 'gr/cvsimport-alternative-cvspass-location'
authorJunio C Hamano <gitster@pobox.com>
Fri, 6 May 2011 17:52:12 +0000 (10:52 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 6 May 2011 17:52:12 +0000 (10:52 -0700)
commit2da61dcf9e678f36f8287b2cacdec2ebf014ae69
treeece3b80760fdc47c3619e2eff935ee4fe5748a90
parent6975ecadd71aed37d6850c954b7caaa932eba0d2
parent58fdef0cff5bcf10f2621d00466b33a5b8a39bf7
Merge branch 'gr/cvsimport-alternative-cvspass-location'

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