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


Trivial merge