Merge branch 'R_2_1'
authorMichael Wallner <mike@php.net>
Mon, 15 Sep 2014 12:18:14 +0000 (14:18 +0200)
committerMichael Wallner <mike@php.net>
Mon, 15 Sep 2014 12:18:14 +0000 (14:18 +0200)
1  2 
php_http_client_curl.c

Simple merge