Merge branch 'maint-1.5.4' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 26 May 2008 05:34:05 +0000 (22:34 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 26 May 2008 05:34:05 +0000 (22:34 -0700)
* maint-1.5.4:
  builtin-fast-export: Only output a single parent per line

1  2 
builtin-fast-export.c

Simple merge