]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1'
authorNikita Popov <nikita.ppv@gmail.com>
Fri, 2 Jun 2017 21:53:00 +0000 (23:53 +0200)
committerNikita Popov <nikita.ppv@gmail.com>
Fri, 2 Jun 2017 21:53:00 +0000 (23:53 +0200)
1  2 
ext/openssl/openssl.c

Simple merge