Code

Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Fri, 13 May 2011 17:58:10 +0000 (10:58 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 13 May 2011 17:58:10 +0000 (10:58 -0700)
commit32341b9df528e4fce87f53dee7bf8487009d01c3
treeb1f8d670788d85cac381850a4cf4030a0e824104
parent240fe0505f4dd96edf288906743368b4b2e3a864
parent375f8a032e9f47d362afd5ea2443f77bcba685cb
Merge branch 'maint'

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

Conflicts:
RelNotes