Merge branch 'jc/maint-mailinfo-mime-attr'
authorJunio C Hamano <gitster@pobox.com>
Tue, 25 Sep 2012 17:39:56 +0000 (10:39 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 25 Sep 2012 17:39:56 +0000 (10:39 -0700)
commitb1bb02dede05e26ae39908ae4ad35f011583bd50
treea804bdd9651232b18c056e7217557bd21cd9f6b0
parentff91dbbf7d8ed9d1f67fe69e62fd883194916b07
parent176943b9658b1fa9ae3972156100d831d19c3576
Merge branch 'jc/maint-mailinfo-mime-attr'

When "git am" is fed an input that has multiple "Content-type: ..."
header, it did not grok charset= attribute correctly.

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