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

diff --cc builtin/blame.c
Simple merge