fix test - output can be chunked
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix test - output can be chunked
Merge branch 'PHP-5.5' into PHP-5.6

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

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

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

Conflicts:
	ext/curl/tests/curl_basic_006.phpt
- Updated to version 2014.3 (2014c)
Merge branch 'PHP-5.4' into PHP-5.5
Merge branch 'PHP-5.5' into PHP-5.6
Merge branch 'PHP-5.6'
Added support for parsing ssl certificates using GeneralizedTime format.

fix bug #65698
fix bug #66636
Merge branch 'bug67250' into PHP-5.4

* bug67250:
  Fix bug #67250 (iptcparse out-of-bounds read)
Merge branch 'bug67252' into PHP-5.4

* bug67252:
  fix bug #67253: timelib_meridian_with_check out-of-bounds read
  Fix bug #67252: convert_uudecode out-of-bounds read
Merge branch 'bug67251' into PHP-5.4

* bug67251:
  Fix bug #67251 - date_parse_from_format out-of-bounds read

Conflicts:
	ext/date/lib/parse_date.c
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  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)

Conflicts:
	ext/date/lib/parse_date.c
	ext/date/lib/parse_date.re
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  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:
  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)
update NEWS
update NEWS
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  update NEWS
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  update NEWS
  update NEWS
update NEWS