]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorAnatol Belski <ab@php.net>
Wed, 5 Feb 2014 14:17:30 +0000 (15:17 +0100)
committerAnatol Belski <ab@php.net>
Wed, 5 Feb 2014 14:17:30 +0000 (15:17 +0100)
* PHP-5.5:
  adapt test to curl 7.35.0 upgrade


Trivial merge