Merge branch 'R_2_1'
authorRemi Collet <remi@php.net>
Thu, 25 Sep 2014 13:09:00 +0000 (15:09 +0200)
committerRemi Collet <remi@php.net>
Thu, 25 Sep 2014 13:09:00 +0000 (15:09 +0200)
commit39456918dd8c443592a2e3fe39f4b1525dc09948
treee891c0d09afe13b027c2264639192100a42c728b
parentd26f54aec37a7ad7468264b8dc12d1eba27ba580
parent62030d589336fc052eab8cf4503ef1968f5d9ac8
Merge branch 'R_2_1'

* R_2_1:
  Fix build with curl < 7.26
php_http_client_curl.c