Merge branch 'ml/cvs'

* ml/cvs:
  Introducing git-cvsserver -- a CVS emulator for git.

diff --cc Makefile
index 4d8aad3711b5bc02b9eb4728c90d4d294ed55002,2d21d4d3a5753d61211a132b3c26117d4086e15f..e79aa96cc3c75bc50338a6ab789639b96ea3db66
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -130,7 -130,7 +130,7 @@@ SCRIPT_SH = 
  SCRIPT_PERL = \
        git-archimport.perl git-cvsimport.perl git-relink.perl \
        git-shortlog.perl git-fmt-merge-msg.perl git-rerere.perl \
-       git-annotate.perl \
 -      git-cvsserver.perl \
++      git-annotate.perl git-cvsserver.perl \
        git-svnimport.perl git-mv.perl git-cvsexportcommit.perl
  
  SCRIPT_PYTHON = \