Merge branch 'PHP-5.6'

author Remi Collet <remi@php.net>

Tue, 16 Dec 2014 07:38:29 +0000 (08:38 +0100)

committer Remi Collet <remi@php.net>

Tue, 16 Dec 2014 07:38:29 +0000 (08:38 +0100)
author Remi Collet <remi@php.net>
Tue, 16 Dec 2014 07:38:29 +0000 (08:38 +0100)
committer Remi Collet <remi@php.net>
Tue, 16 Dec 2014 07:38:29 +0000 (08:38 +0100)
diff --cc ext/openssl/openssl.c

index 60d36ff7435f4d4b4c8772175b38766a233163a3,00fd444c132f650c58f5c4d822e3784e50785a80..60d36ff7435f4d4b4c8772175b38766a233163a3

mode 100755,100644..100644
--- 1/ext/openssl/openssl.c
--- 2/ext/openssl/openssl.c
+++ b/ext/openssl/openssl.c
author	Remi Collet <remi@php.net>
	Tue, 16 Dec 2014 07:38:29 +0000 (08:38 +0100)
committer	Remi Collet <remi@php.net>
	Tue, 16 Dec 2014 07:38:29 +0000 (08:38 +0100)