]> granicus.if.org Git - php/commit
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)
commitfd87b38c4793ee4b5d5509e8bfa962ede8ed5228
treee2b54c2030f1b8a8deb8234e8aba37378d2ddf49
parent918f626d97b4161d5c964a302086181e506a36b5
parent71ebc0a7f3cf54b186a34147d308bdc900ae6ec7
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  adapt test to curl 7.35.0 upgrade