Merge branch 'jc/maint-mailinfo-mime-attr' into maint
authorJunio C Hamano <gitster@pobox.com>
Sun, 30 Sep 2012 05:30:47 +0000 (22:30 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 30 Sep 2012 05:30:48 +0000 (22:30 -0700)
commit52938b113b4dd09bae869326d4993a7b998e6877
tree717e0d86b8a0d24f95b8fd3f3672d321917c4856
parent666ca59a8c88e1750386fa64c7ed4be698fd1b2a
parent176943b9658b1fa9ae3972156100d831d19c3576
Merge branch 'jc/maint-mailinfo-mime-attr' into maint

* jc/maint-mailinfo-mime-attr:
  mailinfo: do not concatenate charset= attribute values from mime headers
builtin/mailinfo.c
t/t5100/sample.mbox