Merge branch 'master' of git.php.net:php-src
Merge branch 'PHP-5.6'

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

* PHP-5.6:
  fix c89 compat
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fixed ZEND_MM_MEM_TYPE=mmap_zero
Fixed warning "No new line at end of file"
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
Merge branch 'PHP-5.6'
Merge branch 'PHP-5.6'
Merge branch 'PHP-5.6'
Merge branch 'PHP-5.6'

* PHP-5.6:
  update version output
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fixed bug #66356 (Heap Overflow Vulnerability in imagecrop())
Merge branch 'PHP-5.6'

* PHP-5.6:
  minor fix on previous
Merge branch 'PHP-5.6'
Merge branch 'PHP-5.6'
Merge branch 'PHP-5.6'
Merge branch 'PHP-5.6'

* PHP-5.6:
  Sync with pecl/zip 1.12.4dev
Merge branch 'PHP-5.6'

* PHP-5.6:
  NEWS
Merge branch 'PHP-5.6'

* PHP-5.6:
  fix compat for PHP ABI changes
Merge branch 'PHP-5.6'

* PHP-5.6:
  missing file from libzip 0.11.2
Merge branch 'PHP-5.6'