Fixed bug #67643 (curl_multi_getcontent returns '' when CURLOPT_RETURNTRANSFER isn't set)
Add a test for bug #67643 (curl_multi_getcontent returns '' when RETURNTRANSFER isn't set)
fix ZTS
Fixed bug #67643 (curl_multi_getcontent returns '' when CURLOPT_RETURNTRANSFER isn't set)
Add a test for bug #67643 (curl_multi_getcontent returns '' when RETURNTRANSFER isn't set)
update NEWS
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  update NEWS
  Add a test for bug #67643 (curl_multi_getcontent returns '' when RETURNTRANSFER isn't set)
  Fixed bug #67643 (curl_multi_getcontent returns '' when CURLOPT_RETURNTRANSFER isn't set)
Merge branch 'pull-request/728'

* pull-request/728:
  Add a test for bug #67643 (curl_multi_getcontent returns '' when RETURNTRANSFER isn't set)
  Fixed bug #67643 (curl_multi_getcontent returns '' when CURLOPT_RETURNTRANSFER isn't set)

Conflicts:
	ext/curl/multi.c
Merge branch 'PHP-5.6'

* PHP-5.6:
  update NEWS
  Add a test for bug #67643 (curl_multi_getcontent returns '' when RETURNTRANSFER isn't set)
  Fixed bug #67643 (curl_multi_getcontent returns '' when CURLOPT_RETURNTRANSFER isn't set)
  fix ZTS

Conflicts:
	ext/curl/multi.c
	ext/date/php_date.c