]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9c27063 e3ca872)
Merge branch 'PHP-5.5' into PHP-5.6
authorStanislav Malyshev <stas@php.net>
Mon, 12 May 2014 17:56:03 +0000 (10:56 -0700)
committerStanislav Malyshev <stas@php.net>
Mon, 12 May 2014 17:56:03 +0000 (10:56 -0700)
* PHP-5.5:
  fix test - output can be chunked

Conflicts:
ext/curl/tests/curl_basic_006.phpt


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.