Merge branch 'master' of .

diff --git a/Makefile b/Makefile
index e2bbcb590ede692b901284b2dae7448352463f7c..9725b1ac9dce251687ae842b7daaf663ca967269 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -83,7 +83,7 @@ SCRIPT_PERL = \
        git-rename.perl git-shortlog.perl
 
 SCRIPT_PYTHON = \
-       git-merge-fredrik.py
+       git-merge-recursive.py
 
 # The ones that do not have to link with lcrypto nor lz.
 SIMPLE_PROGRAMS = \