Merge branch 'ml/cvs' into next

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

diff --combined Makefile
index d13e7e9df16cecc3f95d02c836d44c4e4c3bc5b8,2d21d4d3a5753d61211a132b3c26117d4086e15f..e2fba9583cdb7a59fb5f3b6e383d5aaec5ef7562
--- 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 = \
@@@ -165,7 -165,7 +165,7 @@@ PROGRAMS = 
        git-upload-pack$X git-verify-pack$X git-write-tree$X \
        git-update-ref$X git-symbolic-ref$X git-check-ref-format$X \
        git-name-rev$X git-pack-redundant$X git-repo-config$X git-var$X \
 -      git-describe$X git-merge-tree$X
 +      git-describe$X git-merge-tree$X git-blame$X
  
  # what 'all' will build and 'install' will install, in gitexecdir
  ALL_PROGRAMS = $(PROGRAMS) $(SIMPLE_PROGRAMS) $(SCRIPTS)