]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorStanislav Malyshev <stas@php.net>
Tue, 14 Oct 2014 18:43:34 +0000 (11:43 -0700)
committerStanislav Malyshev <stas@php.net>
Tue, 14 Oct 2014 18:43:34 +0000 (11:43 -0700)
commit47a1447cc8b5be0b19843a21d533984803993755
tree4971d8864ac64cc587348e7e4ec843aeafc2c7b7
parent3e4cef131e503072d6dbb8b406db01fe5e00aefd
parentbb3d43fa05be3c0ae46b5bcc92d2933b00d92d11
Merge branch 'PHP-5.5' into PHP-5.6

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