Merge branch 'PHP-7.0' into PHP-7.1
authorJakub Zelenka <bukka@php.net>
Sun, 4 Jun 2017 17:11:49 +0000 (18:11 +0100)
committerJakub Zelenka <bukka@php.net>
Sun, 4 Jun 2017 17:11:49 +0000 (18:11 +0100)
commitff93f74f63994aaf25323dc94366876b1e6c28a4
treee5fb7e223afd282373f5d9440ed857675bbd0bd6
parent6af1d7ad014ea86c983dd9a59153f3a39073d226
parent3704947696fe0ee93e025fa85621d297ac7a1e4d
Merge branch 'PHP-7.0' into PHP-7.1
ext/openssl/openssl.c