]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1'
authorJakub Zelenka <bukka@php.net>
Sun, 30 Oct 2016 19:13:21 +0000 (19:13 +0000)
committerJakub Zelenka <bukka@php.net>
Sun, 30 Oct 2016 19:13:21 +0000 (19:13 +0000)
1  2 
ext/openssl/openssl.c

Simple merge