]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorStanislav Malyshev <stas@php.net>
Mon, 29 Apr 2013 05:28:13 +0000 (22:28 -0700)
committerStanislav Malyshev <stas@php.net>
Mon, 29 Apr 2013 05:28:13 +0000 (22:28 -0700)
commit8a51bdd3cebf4bb2f49090560da918f70a535ade
tree84f56fbf110f398d58615767e5b9743321132db6
parent86685aefabb70a3c24d1aedd8551019ebf24ed3b
parent4e773c1b92c5db328fbbca36e566a1c76957be63
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Revert "Add CURL_WRAPPERS_ENABLE constant"

Conflicts:
ext/curl/interface.c