Merge branch 'PHP-5.5' into PHP-5.6

author Remi Collet <remi@php.net>

Tue, 16 Dec 2014 07:37:56 +0000 (08:37 +0100)

committer Remi Collet <remi@php.net>

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

index 00fd444c132f650c58f5c4d822e3784e50785a80,4a4ec6f67d9b5f57561d6c0e1b548b6da722979a..00fd444c132f650c58f5c4d822e3784e50785a80

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:37:56 +0000 (08:37 +0100)
committer	Remi Collet <remi@php.net>
	Tue, 16 Dec 2014 07:37:56 +0000 (08:37 +0100)