From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 6 May 2011 17:52:12 +0000 (-0700)
Subject: Merge branch 'gr/cvsimport-alternative-cvspass-location'
X-Git-Tag: v1.7.6-rc0~99
X-Git-Url: http://git.tremily.us/?p=git.git;a=commitdiff_plain;h=2da61dcf9e678f36f8287b2cacdec2ebf014ae69

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

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

2da61dcf9e678f36f8287b2cacdec2ebf014ae69