From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 29 Apr 2011 18:48:13 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.7.6-rc0~131
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=1c08bf50cfcf924094eca56c2486a90e2bf1e6e2;p=git.git

Merge branch 'maint'

* maint:
  Start 1.7.5.1 maintenance track
  git-send-email: fix missing space in error message

Conflicts:
	RelNotes
---

1c08bf50cfcf924094eca56c2486a90e2bf1e6e2