Fixed bug #66298 (ext/opcache/Optimizer/zend_optimizer.c has dos-style ^M as lineend)

Use git blame -w to ingore the space changes
Merge branch 'PHP-5.5' into PHP-5.6
Fixed bug #66298 (ext/opcache/Optimizer/zend_optimizer.c has dos-style ^M as lineend)
Merge branch 'PHP-5.6'
Fix dos style eol in phpts
Merge branch 'PHP-5.5' into PHP-5.6
Fix one more test in dos style eol
Merge branch 'PHP-5.6'
Fix test fail
Merge branch 'PHP-5.5' into PHP-5.6
Merge branch 'PHP-5.6'
Sync with pecl/zip 1.12.4dev

- update bunled libzip to 0.11.2
- expose zip_file_set_external_attributes + zip_file_get_external_attributes
  with new methods:
	ZipArchive::setExternalAttributesName
	ZipArchive::setExternalAttributesIndex
	ZipArchive::getExternalAttributesName
	ZipArchive::getExternalAttributesIndex
Merge branch 'PHP-5.6'

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

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

* PHP-5.6:
  fix compat for PHP ABI changes
missing file from libzip 0.11.2
Merge branch 'PHP-5.6'

* PHP-5.6:
  missing file from libzip 0.11.2
Merge remote-tracking branch 'origin/master' into str_size_and_int64

Conflicts:
	ext/opcache/Optimizer/zend_optimizer.c
	ext/opcache/Optimizer/zend_optimizer_internal.h
	ext/zip/php_zip.c