From: Pierrick Charron <pierrick@php.net>
Date: Fri, 21 Dec 2012 17:25:34 +0000 (-0500)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0alpha3~46
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=52e7b0ce2cb9a8276a423920d7bf6f0f8bffd4df;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix test to work on every libcurl version
  - Fixed typo on "SKIPIF" (causing make test to abort on some systems)
---

52e7b0ce2cb9a8276a423920d7bf6f0f8bffd4df