]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorAnatol Belski <ab@php.net>
Tue, 19 Feb 2013 08:05:27 +0000 (09:05 +0100)
committerAnatol Belski <ab@php.net>
Tue, 19 Feb 2013 08:05:27 +0000 (09:05 +0100)
commit43664e656d8ba30f11a08da165b33c0cb9be81a1
tree7a6c0a0cdde93f7ac04ea2c77c945dc597f82fc3
parentd77eb411ea5d80379ee92a908f543b91fa293383
parentcc34dfce16475ce63c2e987b9a111c37c2cfa19c
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix the test for curl 7.29.0+