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: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=978471dccec18daab3165c60a90ad59cbdb43723;p=thirdparty%2Fgit.git

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