Merge branch 'jk/mbox-from-line' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 7 Oct 2014 20:39:24 +0000 (13:39 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 7 Oct 2014 20:39:27 +0000 (13:39 -0700)
Some MUAs mangled a line in a message that begins with "From " to
">From " when writing to a mailbox file and feeding such an input to
"git am" used to lose such a line.

* jk/mbox-from-line:
mailinfo: work around -Wstring-plus-int warning
mailinfo: make ">From" in-body header check more robust

Trivial merge