From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 25 Sep 2012 17:39:56 +0000 (-0700)
Subject: Merge branch 'jc/maint-mailinfo-mime-attr'
X-Git-Tag: v1.8.0-rc0~25
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b1bb02dede05e26ae39908ae4ad35f011583bd50;p=git.git

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
---

b1bb02dede05e26ae39908ae4ad35f011583bd50