From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 13 May 2011 17:45:00 +0000 (-0700)
Subject: Merge branch 'js/blame-parsename' into maint
X-Git-Tag: v1.7.5.2~23
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bc67ad8c375ce8f31021411f088a968f12cb2675;p=thirdparty%2Fgit.git

Merge branch 'js/blame-parsename' into maint

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

bc67ad8c375ce8f31021411f088a968f12cb2675