]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6' into PHP-7.0
authorJakub Zelenka <bukka@php.net>
Wed, 3 Feb 2016 16:22:39 +0000 (16:22 +0000)
committerJakub Zelenka <bukka@php.net>
Wed, 3 Feb 2016 16:22:39 +0000 (16:22 +0000)
commitcdf99ffc6959c7038ce49ea5bf6e364c83cefd40
tree373af3ae73b9cee2d06451030c7cf6043b882bb5
parent3a2c9e6e1dfe4b6b39b32dd09b18675c8dc8d5bc
parent1f3906c1ce24931fac60735c48bff3cfda760409
Merge branch 'PHP-5.6' into PHP-7.0
ext/openssl/tests/openssl_csr_sign_basic.phpt
ext/openssl/tests/openssl_pkcs7_decrypt_error.phpt
ext/openssl/tests/openssl_pkey_export_basic.phpt
ext/openssl/tests/openssl_x509_export_basic.phpt