Merge branch 'maint'
commit7e94805db2a69e3fe6b9833fdaa6eb80de33959c
authorJunio C Hamano <gitster@pobox.com>
Sat, 13 Feb 2010 23:14:04 +0000 (13 15:14 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sat, 13 Feb 2010 23:14:04 +0000 (13 15:14 -0800)
treef88355d1fd22ead7663bbc594533c3e756a8ac83
parent263830c47b0ddd3440fbc87a841499fe699a50b1
parent9b2504831859ffdffbe15b9a6a7b7ede37557b06
Merge branch 'maint'

* maint:
  Start 1.7.0 maintenance track

Conflicts:
RelNotes