Merge branch 'R_2_1'
authorMichael Wallner <mike@php.net>
Thu, 6 Nov 2014 10:13:32 +0000 (11:13 +0100)
committerMichael Wallner <mike@php.net>
Thu, 6 Nov 2014 10:13:32 +0000 (11:13 +0100)
1  2 
php_http_client_curl.c

Simple merge