Merge branch 'PHP-5.6'

diff --cc Zend/zend.c
Simple merge

diff --cc Zend/zend.h
Simple merge

diff --cc Zend/zend_API.c
Simple merge

diff --cc Zend/zend_API.h
Simple merge

diff --cc Zend/zend_alloc.c
Simple merge

diff --cc Zend/zend_alloc.h
Simple merge

diff --cc Zend/zend_ast.c
Simple merge

diff --cc Zend/zend_execute.h
Simple merge

diff --cc Zend/zend_execute_API.c
Simple merge

diff --cc Zend/zend_extensions.c
Simple merge

diff --cc Zend/zend_extensions.h
Simple merge

diff --cc Zend/zend_indent.c
Simple merge

diff --cc Zend/zend_indent.h
Simple merge

diff --cc Zend/zend_interfaces.c
Simple merge

diff --cc Zend/zend_modules.h
Simple merge

diff --cc Zend/zend_object_handlers.c
Simple merge

diff --cc Zend/zend_vm_def.h
Simple merge

diff --cc Zend/zend_vm_execute.h
Simple merge

diff --cc Zend/zend_vm_gen.php
Simple merge

diff --cc Zend/zend_vm_opcodes.h
Simple merge

diff --cc ext/dba/dba_inifile.c
Simple merge

diff --cc ext/dba/libinifile/inifile.c
Simple merge

diff --cc ext/dba/libinifile/inifile.h
Simple merge

diff --cc ext/dom/php_dom.c
Simple merge

diff --cc ext/json/json.c
Simple merge

diff --cc ext/mysqlnd/mysqlnd_net.c
Simple merge

diff --cc ext/opcache/ZendAccelerator.c
Simple merge

diff --cc ext/opcache/ZendAccelerator.h
Simple merge

diff --cc ext/opcache/zend_accelerator_module.c
Simple merge

diff --cc ext/opcache/zend_accelerator_module.h
Simple merge

diff --cc ext/openssl/xp_ssl.c
Simple merge

diff --cc ext/pcntl/pcntl.c
Simple merge

diff --cc ext/soap/php_encoding.c
Simple merge

diff --cc ext/spl/spl_array.c
Simple merge

diff --cc ext/spl/spl_directory.c
Simple merge

diff --cc ext/spl/spl_fixedarray.c
Simple merge

diff --cc ext/spl/spl_iterators.c
Simple merge

diff --cc ext/standard/array.c
Simple merge

diff --cc ext/standard/basic_functions.c
Simple merge

diff --cc ext/standard/ftp_fopen_wrapper.c
Simple merge

diff --cc ext/standard/http_fopen_wrapper.c
Simple merge

diff --cc ext/standard/type.c
Simple merge

diff --cc ext/xsl/php_xsl.c
Simple merge

diff --cc main/SAPI.c
Simple merge

diff --cc main/SAPI.h
Simple merge

diff --cc main/main.c
Simple merge

diff --cc main/php.h
Simple merge

diff --cc main/php_content_types.c
Simple merge

diff --cc main/php_globals.h
Simple merge

diff --cc main/php_ini.c
Simple merge

diff --cc main/php_ticks.c
Simple merge

diff --cc main/php_ticks.h
Simple merge

diff --cc main/php_variables.c
Simple merge

diff --cc main/streams/php_stream_context.h
Simple merge

diff --cc main/streams/streams.c
Simple merge

diff --cc main/streams/transports.c
Simple merge

diff --cc main/streams/userspace.c
Simple merge

diff --cc sapi/apache/mod_php5.c
Simple merge

diff --cc sapi/apache2filter/sapi_apache2.c
Simple merge

diff --cc sapi/apache2handler/sapi_apache2.c
Simple merge

diff --cc sapi/apache_hooks/mod_php5.c
Simple merge

diff --cc sapi/apache_hooks/php_apache.c
Simple merge

diff --cc sapi/caudium/caudium.c
Simple merge

diff --cc sapi/cgi/cgi_main.c
Simple merge

diff --cc sapi/cli/php_cli.c
Simple merge

diff --cc sapi/cli/php_cli_server.c
Simple merge

diff --cc sapi/continuity/capi.c
Simple merge

diff --cc sapi/embed/php_embed.c
Simple merge

diff --cc sapi/fpm/fpm/fpm_main.c
Simple merge

diff --cc sapi/milter/php_milter.c
Simple merge

diff --cc sapi/nsapi/nsapi.c
Simple merge

diff --cc sapi/pi3web/pi3web_sapi.c
Simple merge

diff --cc sapi/roxen/roxen.c
Simple merge

diff --cc sapi/thttpd/thttpd.c
Simple merge

diff --cc sapi/tux/php_tux.c
Simple merge