Merge branch 'ml/cvs' into next

diff --git a/Makefile b/Makefile
index d13e7e9df16cecc3f95d02c836d44c4e4c3bc5b8..e2fba9583cdb7a59fb5f3b6e383d5aaec5ef7562 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -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-annotate.perl git-cvsserver.perl \
        git-svnimport.perl git-mv.perl git-cvsexportcommit.perl
 
 SCRIPT_PYTHON = \