Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Wed, 3 Mar 2010 22:56:13 +0000 (14:56 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 3 Mar 2010 22:56:13 +0000 (14:56 -0800)
commit6d84bcb5de78251d98f7d3e80e822d9a4b8f4df3
tree57c3291c571c0a3d3cc66b151afeb45811f8fdf1
parent66a5eeffff3229b2475173adfe57e6e91a15b2c8
parent511da22ecfb325bb693c0877e2a0d35fdba69a90
Merge branch 'maint'

* maint:
  Start preparing for 1.7.0.2

Conflicts:
RelNotes