From: Daniel Lowrey <rdlowrey@php.net>
Date: Wed, 19 Feb 2014 11:01:08 +0000 (-0700)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.11RC1~70
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a7d36066507b8d43c4a63bb60ba3ec1de3b68aaf;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Skip failing tests when EC unavailable (RHEL)

Conflicts:
	ext/openssl/openssl.c
---

a7d36066507b8d43c4a63bb60ba3ec1de3b68aaf