From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 29 Mar 2010 04:52:18 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.7.1-rc0~38
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ff0a181fa6580d29ce0ab7abf79780a1fa3c5555;p=thirdparty%2Fgit.git

Merge branch 'maint'

* maint:
  Prepare for 1.7.0.4

Conflicts:
	RelNotes
---

ff0a181fa6580d29ce0ab7abf79780a1fa3c5555