From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 6 May 2011 17:50:32 +0000 (-0700)
Subject: Merge branch 'js/blame-parsename'
X-Git-Tag: v1.7.6-rc0~101
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=2190a43c42a049d75344a381f3c8d947876c997b;p=git.git

Merge branch 'js/blame-parsename'

* js/blame-parsename:
  t/annotate-tests: Use echo & cat instead of sed
  blame: tolerate bogus e-mail addresses a bit better
---

2190a43c42a049d75344a381f3c8d947876c997b