Merge branch 'maint'

* maint:
builtin-fast-export: Only output a single parent per line
Release Notes for 1.5.5.2

Conflicts:

RelNotes

diff --combined builtin-fast-export.c
index ff759cc578ac28c8f321124b25ff7539882382b6,4ab93fcf780c100f9af3bb6d4ddf3cbe86f73b3d..1dfc01e8f009968ef5d6118bffed7818e736576c
--- 1/builtin-fast-export.c
--- 2/builtin-fast-export.c
+++ b/builtin-fast-export.c
@@@ -204,14 -204,10 +204,10 @@@ static void handle_commit(struct commi
                        continue;
                if (i == 0)
                        printf("from :%d\n", mark);
-               else if (i == 1)
-                       printf("merge :%d", mark);
                else
-                       printf(" :%d", mark);
+                       printf("merge :%d\n", mark);
                i++;
        }
-       if (i > 1)
-               printf("\n");
  
        log_tree_diff_flush(rev);
        rev->diffopt.output_format = saved_output_format;
@@@ -372,7 -368,7 +368,7 @@@ int cmd_fast_export(int argc, const cha
        };
  
        /* we handle encodings */
 -      git_config(git_default_config);
 +      git_config(git_default_config, NULL);
  
        init_revisions(&revs, prefix);
        argc = setup_revisions(argc, argv, &revs, NULL);