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

Merge branch 'PHP-5.4' into PHP-5.5

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

fd87b38c4793ee4b5d5509e8bfa962ede8ed5228