From: Anatol Belski <ab@php.net>
Date: Tue, 19 Feb 2013 08:05:27 +0000 (+0100)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0alpha6~59
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=43664e656d8ba30f11a08da165b33c0cb9be81a1;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix the test for curl 7.29.0+
---

43664e656d8ba30f11a08da165b33c0cb9be81a1