Merge branch 'jk/cvsimport-does-not-work-with-cvsps3' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 4 Feb 2013 18:04:22 +0000 (4 10:04 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 4 Feb 2013 18:04:23 +0000 (4 10:04 -0800)
* jk/cvsimport-does-not-work-with-cvsps3:
  git-cvsimport.txt: cvsps-2 is deprecated

1  2 
Documentation/git-cvsimport.txt

Simple merge