Merge branch 'PHP-5.6'

* PHP-5.6:
  Improved empty string handling. Now ZE uses an interned string instead of allocation new empty string each time. (Some extensions might need to be fixed using str_efree() instead of efree() to support interned strings).

Conflicts:
	NEWS
	Zend/zend_extensions.h
	Zend/zend_modules.h

diff --cc Zend/zend.h
Simple merge

diff --cc Zend/zend_extensions.h
index 3ef28804e68e3297b39faeeb3d7c3b7548cf6e38,44e516a37e149751eaa96a014b911146753de82d..3fe84b998961658c1129b68a5c5dd5176f91d880
--- 1/Zend/zend_extensions.h
--- 2/Zend/zend_extensions.h
+++ b/Zend/zend_extensions.h
@@@ -28,7 -28,7 +28,7 @@@
  /* The first number is the engine version and the rest is the date.
   * This way engine 2/3 API no. is always greater than engine 1 API no..
   */
- #define ZEND_EXTENSION_API_NO 220131218
 -#define ZEND_EXTENSION_API_NO 220131226
++#define ZEND_EXTENSION_API_NO 220131227
  
  typedef struct _zend_extension_version_info {
        int zend_extension_api_no;

diff --cc Zend/zend_modules.h
index 946406fb02a19ff4b12a5a6d36fed51e3d576745,6be24f25eb5504b17fc3dd723f27b727703521b3..24f56feff7c24a7145d8b210fd314c9b0d057fdc
--- 1/Zend/zend_modules.h
--- 2/Zend/zend_modules.h
+++ b/Zend/zend_modules.h
@@@ -33,7 -33,7 +33,7 @@@
  #define ZEND_MODULE_INFO_FUNC_ARGS zend_module_entry *zend_module TSRMLS_DC
  #define ZEND_MODULE_INFO_FUNC_ARGS_PASSTHRU zend_module TSRMLS_CC
  
- #define ZEND_MODULE_API_NO 20131218
 -#define ZEND_MODULE_API_NO 20131226
++#define ZEND_MODULE_API_NO 20131227
  #ifdef ZTS
  #define USING_ZTS 1
  #else

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

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