]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorTjerk Meesters <datibbaw@php.net>
Fri, 28 Feb 2014 14:30:21 +0000 (22:30 +0800)
committerTjerk Meesters <datibbaw@php.net>
Fri, 28 Feb 2014 14:30:21 +0000 (22:30 +0800)
* PHP-5.4:
  Fixed test case title
  [bug 66535] X-PHP-Originating-Script adds newline if no custom headers are given

1  2 
ext/standard/mail.c

Simple merge