From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 8 Mar 2010 08:52:01 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.7.1-rc0~78
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/c6830a3b7ea043714966121e40f47d1077c681ac?ds=inline;hp=-c

Merge branch 'maint'

* maint:
Merge accumulated fixes to prepare for 1.7.0.3

Conflicts:
RelNotes
---

c6830a3b7ea043714966121e40f47d1077c681ac