From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 26 May 2008 05:43:05 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.5.6-rc1~47
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8366b7baae7e5a33f609b07c939a3571653a2314;p=git.git

Merge branch 'maint'

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

Conflicts:

	RelNotes
---

8366b7baae7e5a33f609b07c939a3571653a2314