]> granicus.if.org Git - php/commit
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)
commit52e7b0ce2cb9a8276a423920d7bf6f0f8bffd4df
tree8eca2050f634f13c9d52ac5a9e3231c8f1f0c3bb
parent9d235eadc86b5cd730d2e4d683262c20f34aaa4e
parent59a4514dc0e8950ce210036332cc64c414fdcc22
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix test to work on every libcurl version
  - Fixed typo on "SKIPIF" (causing make test to abort on some systems)