Fix test
Merge branch 'PHP-5.6'
Merge branch 'master' of git.php.net:php-src
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
brought the ext/sybase_ct/config.w32 up to date
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  brought the ext/sybase_ct/config.w32 up to date
Merge branch 'PHP-5.6'

* PHP-5.6:
  brought the ext/sybase_ct/config.w32 up to date
fix c89 compat
Merge branch 'PHP-5.6'

* PHP-5.6:
  fix c89 compat
Fixed ZEND_MM_MEM_TYPE=mmap_zero
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed ZEND_MM_MEM_TYPE=mmap_zero

Conflicts:
	NEWS
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fixed ZEND_MM_MEM_TYPE=mmap_zero
Fixed warning "No new line at end of file"
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).
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
Fixed bug #66356 (Heap Overflow Vulnerability in imagecrop())

And also fixed the bug: arguments are altered after some calls
Merge branch 'PHP-5.5' into PHP-5.6

Conflicts:
	main/php_version.h
Merge branch 'PHP-5.6'
Revert accidented committed php_version.h
Merge branch 'PHP-5.5' into PHP-5.6

Conflicts:
	main/php_version.h