From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 3 Mar 2010 22:56:13 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.7.1-rc0~103
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=6d84bcb5de78251d98f7d3e80e822d9a4b8f4df3;p=git.git

Merge branch 'maint'

* maint:
  Start preparing for 1.7.0.2

Conflicts:
	RelNotes
---

6d84bcb5de78251d98f7d3e80e822d9a4b8f4df3