From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 13 May 2011 17:58:10 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.7.6-rc0~81
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=32341b9df528e4fce87f53dee7bf8487009d01c3;p=thirdparty%2Fgit.git

Merge branch 'maint'

* maint:
  Prepare for 1.7.5.2
  t5400: Fix a couple of typos

Conflicts:
	RelNotes
---

32341b9df528e4fce87f53dee7bf8487009d01c3