![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 29 Mar 2010 04:52:18 +0000 (21:52 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 29 Mar 2010 04:52:18 +0000 (21:52 -0700) | ||
| commit | ff0a181fa6580d29ce0ab7abf79780a1fa3c5555 | |
| tree | fab0521bc4c6168b85108e033c4601b25753f0e9 | tree | snapshot |
| parent | 0acb62f202617cc58b6b4039dc9c7ad955ef0c88 | commit | diff |
| parent | e07665e524d0398a34059d605f674182bfeeaf39 | commit | diff |
Merge branch 'maint'
* maint:
Prepare for 1.7.0.4
Conflicts:
RelNotes
* maint:
Prepare for 1.7.0.4
Conflicts:
RelNotes