com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/openssl/openssl.c
| From: | rdlowrey@php.net | Date: | Wed, 19 Feb 2014 11:01:08 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/openssl/openssl.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-76118@lists.php.net to get a copy of this message | ||
Commit: a7d36066507b8d43c4a63bb60ba3ec1de3b68aaf
Author: Daniel Lowrey <rdlowrey@php.net> Wed, 19 Feb 2014 04:01:08 -0700
Parents: 8dd99dd2dc748b323f18619fa7bfa940e8d4dd9a 633f898f1520253d3530fe91fc82f68bca7c4627
Branches: PHP-5.5
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=a7d36066507b8d43c4a63bb60ba3ec1de3b68aaf
Log:
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Skip failing tests when EC unavailable (RHEL)
Conflicts:
ext/openssl/openssl.c
Changed paths:
MM ext/openssl/openssl.c
Diff: