Code

Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Sat, 13 Feb 2010 23:14:04 +0000 (15:14 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sat, 13 Feb 2010 23:14:04 +0000 (15:14 -0800)
* maint:
  Start 1.7.0 maintenance track

Conflicts:
RelNotes


Trivial merge