]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorJakub Zelenka <bukka@php.net>
Mon, 4 Jan 2016 16:53:30 +0000 (16:53 +0000)
committerJakub Zelenka <bukka@php.net>
Mon, 4 Jan 2016 16:53:30 +0000 (16:53 +0000)
1  2 
ext/openssl/openssl.c

Simple merge