Merge branch 'R_2_1'
authorMichael Wallner <mike@php.net>
Thu, 25 Sep 2014 07:23:34 +0000 (09:23 +0200)
committerMichael Wallner <mike@php.net>
Thu, 25 Sep 2014 07:23:34 +0000 (09:23 +0200)
1  2 
php_http_client_curl.c

Simple merge