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

Junio C Hamano committed May 13, 2011 at 10:45 UTC bc67ad8c375ce8f31021411f088a968f12cb2675

No changes.