Code

Merge branch 'js/blame-parsename' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 13 May 2011 17:45:00 +0000 (10:45 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 13 May 2011 17:45:00 +0000 (10:45 -0700)
* js/blame-parsename:
  t/annotate-tests: Use echo & cat instead of sed
  blame: tolerate bogus e-mail addresses a bit better


Trivial merge