]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorPierrick Charron <pierrick@php.net>
Fri, 21 Dec 2012 17:25:34 +0000 (12:25 -0500)
committerPierrick Charron <pierrick@php.net>
Fri, 21 Dec 2012 17:25:34 +0000 (12:25 -0500)
* PHP-5.4:
  Fix test to work on every libcurl version
  - Fixed typo on "SKIPIF" (causing make test to abort on some systems)


Trivial merge