Merge branch 'gr/cvsimport-alternative-cvspass-location'

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

Junio C Hamano committed May 6, 2011 at 10:52 UTC 2da61dcf9e678f36f8287b2cacdec2ebf014ae69

No changes.