Merge branch 'er/stop-recommending-parsecvs' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 28 Jan 2013 19:09:37 +0000 (11:09 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 28 Jan 2013 19:09:37 +0000 (11:09 -0800)
* er/stop-recommending-parsecvs:
  Remove the suggestion to use parsecvs, which is currently broken.

1  2 
Documentation/git-cvsimport.txt

Simple merge