]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorStanislav Malyshev <stas@php.net>
Tue, 14 Oct 2014 18:45:01 +0000 (11:45 -0700)
committerStanislav Malyshev <stas@php.net>
Tue, 14 Oct 2014 18:45:01 +0000 (11:45 -0700)
commit01d17228dc62ea30b7ad25835f049ccd1998b5f2
tree2abe6e759d8c1383dd936675248689c685ac6b1a
parentd9559d0ecd81ea09575cdbb20e908d5516cad4ad
parent47a1447cc8b5be0b19843a21d533984803993755
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fix return code (merges are hard :( )
ext/curl/interface.c