Merge branch 'maint'
commitff0a181fa6580d29ce0ab7abf79780a1fa3c5555
authorJunio C Hamano <gitster@pobox.com>
Mon, 29 Mar 2010 04:52:18 +0000 (28 21:52 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 29 Mar 2010 04:52:18 +0000 (28 21:52 -0700)
treefab0521bc4c6168b85108e033c4601b25753f0e9
parent0acb62f202617cc58b6b4039dc9c7ad955ef0c88
parente07665e524d0398a34059d605f674182bfeeaf39
Merge branch 'maint'

* maint:
  Prepare for 1.7.0.4

Conflicts:
RelNotes