From: Anatol Belski <ab@php.net>
Date: Wed, 5 Feb 2014 14:17:30 +0000 (+0100)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.0alpha2~1^2~14
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5180425ca9ede2c0178eca64252e4680549fd1e6;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  adapt test to curl 7.35.0 upgrade
---

5180425ca9ede2c0178eca64252e4680549fd1e6