Merge branch 'v2.6.x'
authorMichael Wallner <mike@php.net>
Tue, 24 May 2016 18:27:30 +0000 (20:27 +0200)
committerMichael Wallner <mike@php.net>
Tue, 24 May 2016 18:27:30 +0000 (20:27 +0200)
commit54059a470e850eb8380bde2a4ed117e25c1b3e95
treeadfd76e28d95ed3a069e61d131d2fa8a994b5324
parentab1eba311be2f8aab98eed7a6164e79d69b402b2
parent7f176b21742b58b6934d0bb833b922ff6ca54bff
Merge branch 'v2.6.x'
src/php_http_client_curl.c