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)

diff --cc NEWS
index 19b88d7d7d2228f2db728aa04a3eb6ba6d3b5328,ce2503168f65abf5e7b77b7c9732073f8cd9caca..ba30d9e8e10f6c8afead151d7b73d5620abe70b8
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -4,13 -4,13 +4,17 @@@ PH
  
  - Core:
    . Upgraded crypt_blowfish to version 1.3. (Leigh)
 -  . Fixed bug #60704 (unlink() bug with some files path). 
 +  . Fixed bug #60704 (unlink() bug with some files path).
    . Fixed bug #65419 (Inside trait, self::class != __CLASS__). (Julien)
  
+ - cURL:
+   . Fixed bug #67643 (curl_multi_getcontent returns '' when
+     CURLOPT_RETURNTRANSFER isn't set). (Jille Timmermans)
+ 
 +- Date:
 +  . Implemented FR #68268 (DatePeriod: Getter for start date, end date and 
 +    interval). (Marc Bennewitz)
 +
  - mbstring:
    . Fixed bug #68504 (--with-libmbfl configure option not present on Windows).
      (Ashesh Vashi)