fix test
Merge branch 'PHP-5.6'

* PHP-5.6:
  fix test - output can be chunked
  fix test

Conflicts:
	ext/curl/tests/curl_basic_006.phpt
Merge branch 'PHP-5.6'
Merge branch 'PHP-5.6'

* PHP-5.6:
  fix bug #67253: timelib_meridian_with_check out-of-bounds read
  Fix bug #67252: convert_uudecode out-of-bounds read
  Fix bug #67251 - date_parse_from_format out-of-bounds read
  Fix bug #67250 (iptcparse out-of-bounds read)
Merge branch 'PHP-5.6'

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

* PHP-5.6:
  enable email notifications
Merge branch 'PHP-5.6'

* PHP-5.6:
  5.4.30 next
Merge branch 'PHP-5.6'

* PHP-5.6:
  adding NEWS block for beta4
Merge branch 'PHP-5.6'

Conflicts:
	ext/spl/spl_array.c
gcov: tentative fix for broken coverage data after fix for opcache coverage
slightly hackish, but works. The idea is that we want to give priority to .gcda files in .libs dirs vs the files in the upper level dir
Merge branch 'PHP-5.6'

* PHP-5.6:
  Optimize ZEND_POW (Rouven Weßling)
  gcov: tentative fix for broken coverage data after fix for opcache coverage slightly hackish, but works. The idea is that we want to give priority to .gcda files in .libs dirs vs the files in the upper level dir

Conflicts:
	ext/opcache/ZendAccelerator.h
Merge branch 'PHP-5.6'

* PHP-5.6:
  Support for __debugInfo (Joe Watkins)
Merge branch 'PHP-5.6'

* PHP-5.6:
  fix typo in ODBC code
  gcov: tentative fix for broken coverage data after fix for opcache coverage slightly hackish, but works. The idea is that we want to give priority to .gcda files in .libs dirs vs the files in the upper level dir
  5.5.14 now
  Fix bug #67060: use default mode of 660
Merge branch 'PHP-5.6'

* PHP-5.6:
  Improved test for bug #62479
Merge branch 'PHP-5.6'

* PHP-5.6:
  Add microseconds to the serialised form of DateTime objects.
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fix run-tests.php with Valgrind >= 3.10.0.
Added tests for ZipArchive::addGlob() and ZipArchive::addPattern()
Merge branch 'PHP-5.6'

* PHP-5.6:
  Further test fixes for the fdb2709 breakage.
  Fix broken test caused by fdb2709.
Merge branch 'new-tests' of https://github.com/SammyK/php-src
Merge branch 'PHP-5.6'