]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1'
authorJakub Zelenka <bukka@php.net>
Wed, 25 Jan 2017 19:56:19 +0000 (19:56 +0000)
committerJakub Zelenka <bukka@php.net>
Wed, 25 Jan 2017 19:56:19 +0000 (19:56 +0000)
1  2 
ext/openssl/openssl.c

Simple merge