author | Junio C Hamano <gitster@pobox.com> | |
Sat, 13 Feb 2010 23:14:04 +0000 (15:14 -0800) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Sat, 13 Feb 2010 23:14:04 +0000 (15:14 -0800) | ||
commit | 7e94805db2a69e3fe6b9833fdaa6eb80de33959c | |
tree | f88355d1fd22ead7663bbc594533c3e756a8ac83 | tree | snapshot |
parent | 263830c47b0ddd3440fbc87a841499fe699a50b1 | commit | diff |
parent | 9b2504831859ffdffbe15b9a6a7b7ede37557b06 | commit | diff |
Merge branch 'maint'
* maint:
Start 1.7.0 maintenance track
Conflicts:
RelNotes
* maint:
Start 1.7.0 maintenance track
Conflicts:
RelNotes