Merge fixes early for next maint series.

diff --git a/Makefile b/Makefile
index 4d8aad3711b5bc02b9eb4728c90d4d294ed55002..e79aa96cc3c75bc50338a6ab789639b96ea3db66 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 = \