]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorTjerk Meesters <datibbaw@php.net>
Thu, 24 Jul 2014 06:40:30 +0000 (14:40 +0800)
committerTjerk Meesters <datibbaw@php.net>
Thu, 24 Jul 2014 06:40:30 +0000 (14:40 +0800)
1  2 
ext/openssl/xp_ssl.c

Simple merge