Merge branch 'v2.6.x'
authorMichael Wallner <mike@php.net>
Tue, 24 May 2016 15:26:31 +0000 (17:26 +0200)
committerMichael Wallner <mike@php.net>
Tue, 24 May 2016 15:26:31 +0000 (17:26 +0200)
commitab1eba311be2f8aab98eed7a6164e79d69b402b2
treebe3a82b47e8e3fa92cd367cc4a3f3146a0135926
parent0dcea0adfd0ca4c24b11d7d2aa642e20f7891575
parenta2aa970a129880a247baea08927f0d84188a0b19
Merge branch 'v2.6.x'
README.md
src/php_http_client_curl.c
tests/helper/proxy.inc