Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Mon, 26 May 2008 05:43:05 +0000 (22:43 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 26 May 2008 05:43:05 +0000 (22:43 -0700)
commit8366b7baae7e5a33f609b07c939a3571653a2314
treec4ba1932ba5b3dbd15cee76101160a1de15a9b4e
parentfa620f1ac8191fa72e54b8b6acc3e424ecfae26e
parenta2f5be500839bdf75e4721cc68642b821128b7b9
Merge branch 'maint'

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

Conflicts:

RelNotes
builtin-fast-export.c