Merge branch 'PHP-5.5'

* PHP-5.5:
  Added support for TLSv1.1 and TLSv1.2

Conflicts:
	ext/openssl/xp_ssl.c

diff --cc ext/openssl/openssl.c
Simple merge

diff --cc ext/openssl/xp_ssl.c
Simple merge

diff --cc ext/standard/file.c
Simple merge

diff --cc main/streams/php_stream_transport.h
Simple merge