Merge branch 'jk/cvsimport-does-not-work-with-cvsps3' into maint

* jk/cvsimport-does-not-work-with-cvsps3: git-cvsimport.txt: cvsps-2 is deprecated

Junio C Hamano committed Feb 4, 2013 at 10:04 UTC 3d00a5c148ee5611fc21de6d20f5f82602a75c5f

No changes.