From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 13 May 2011 17:44:54 +0000 (-0700)
Subject: Merge branch 'gr/cvsimport-alternative-cvspass-location' into maint
X-Git-Tag: v1.7.5.2~24
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/978471dccec18daab3165c60a90ad59cbdb43723?ds=inline;hp=--cc

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

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

978471dccec18daab3165c60a90ad59cbdb43723