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)
* gr/cvsimport-alternative-cvspass-location:
  Look for password in both CVS and CVSNT password files.

1  2 
git-cvsimport.perl

Simple merge