]> granicus.if.org Git - php/commitdiff
Merge branch 'openssl_1_1_port'
authorJakub Zelenka <bukka@php.net>
Wed, 20 Jul 2016 18:32:07 +0000 (19:32 +0100)
committerJakub Zelenka <bukka@php.net>
Wed, 20 Jul 2016 18:32:07 +0000 (19:32 +0100)

Trivial merge