From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 22 Jun 2010 16:35:36 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.7.2-rc0~18
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=262657dce61b417d712a7f4cd85ff8ff4c6ec3a4;p=git.git

Merge branch 'maint'

* maint:
  Update draft release notes to 1.7.1.1
  tests: remove unnecessary '^' from 'expr' regular expression

Conflicts:
	diff.c
---

262657dce61b417d712a7f4cd85ff8ff4c6ec3a4