]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' into PHP-7.1
authorLeigh <leigh@php.net>
Wed, 18 Jan 2017 14:47:49 +0000 (14:47 +0000)
committerLeigh <leigh@php.net>
Wed, 18 Jan 2017 14:47:49 +0000 (14:47 +0000)
1  2 
ext/openssl/openssl.c

Simple merge