]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorXinchen Hui <laruence@php.net>
Fri, 19 Jun 2015 01:36:27 +0000 (09:36 +0800)
committerXinchen Hui <laruence@php.net>
Fri, 19 Jun 2015 01:36:27 +0000 (09:36 +0800)
1  2 
ext/standard/mail.c

Simple merge