]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorXinchen Hui <laruence@php.net>
Wed, 25 Mar 2015 04:10:54 +0000 (12:10 +0800)
committerXinchen Hui <laruence@php.net>
Wed, 25 Mar 2015 04:10:54 +0000 (12:10 +0800)
Conflicts:
ext/soap/php_encoding.c


Trivial merge