Merge branch 'v2.6.x'
authorMichael Wallner <mike@php.net>
Tue, 23 Aug 2016 11:46:50 +0000 (13:46 +0200)
committerMichael Wallner <mike@php.net>
Tue, 23 Aug 2016 11:46:50 +0000 (13:46 +0200)
commit06e6ed638087fb1f8ee2a5c950c7bd71d4b12eef
tree715e09046520836b2c517dba38963f5965ed856e
parentd7652a44e061886c95dcb730e13c52163039d429
parent92d8f06029623d719357ad7d08d42909996768f9
Merge branch 'v2.6.x'
src/php_http_client_curl.c