]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorDaniel Lowrey <rdlowrey@php.net>
Wed, 19 Feb 2014 11:01:57 +0000 (04:01 -0700)
committerDaniel Lowrey <rdlowrey@php.net>
Wed, 19 Feb 2014 11:01:57 +0000 (04:01 -0700)
commitd9036d14f7eae2996b98e70fcb2dd5dbd40d3b5b
tree9a410a342dda471ccfc547840f1afd075ae1372d
parent3e82ff615f42e9d114b47432e7aa105d161b5bb1
parenta7d36066507b8d43c4a63bb60ba3ec1de3b68aaf
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Skip failing tests when EC unavailable (RHEL)
ext/openssl/openssl.c