Merge branch 'js/blame-parsename' into maint
commitbc67ad8c375ce8f31021411f088a968f12cb2675
authorJunio C Hamano <gitster@pobox.com>
Fri, 13 May 2011 17:45:00 +0000 (13 10:45 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 13 May 2011 17:45:00 +0000 (13 10:45 -0700)
tree5cc9d598cf4040177c3765322f9b5f2551ba0d08
parent978471dccec18daab3165c60a90ad59cbdb43723
parentc01bd5a29f38e4e9fd5c03f3e1e84b88c392dd6f
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