Merge branch 'jk/format-patch-quote-special-in-from'
authorJunio C Hamano <gitster@pobox.com>
Fri, 6 May 2011 17:50:18 +0000 (10:50 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 6 May 2011 17:50:18 +0000 (10:50 -0700)
commitace8ebbcf5f07a5519cbeb0ae0571d8b40222e34
treecb7b4bf9560d6751816f1ac79caaccf27611aa25
parent1273738f05dedc63865085deb5d1fb8816ff809c
parent4d03c18a3ea18138c24d379ccc25e219a36ca1ef
Merge branch 'jk/format-patch-quote-special-in-from'

* jk/format-patch-quote-special-in-from:
  pretty: quote rfc822 specials in email addresses

Conflicts:
pretty.c
t/t4014-format-patch.sh
pretty.c
t/t4014-format-patch.sh