]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorTjerk Meesters <datibbaw@php.net>
Thu, 31 Jul 2014 04:18:19 +0000 (12:18 +0800)
committerTjerk Meesters <datibbaw@php.net>
Thu, 31 Jul 2014 04:18:19 +0000 (12:18 +0800)
* PHP-5.6:
  Moved streams related functions to xp_ssl.c

1  2 
ext/openssl/openssl.c
ext/openssl/xp_ssl.c

Simple merge
Simple merge