]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6' into PHP-7.0
authorJakub Zelenka <bukka@php.net>
Mon, 25 Jan 2016 17:19:18 +0000 (17:19 +0000)
committerJakub Zelenka <bukka@php.net>
Mon, 25 Jan 2016 17:19:18 +0000 (17:19 +0000)
commit67c1921e2b01f298977c15e7352b6002ed175ea1
tree5cc87bc8af4f2c0bf5be39e956130521546f110c
parentc140bbb5dbf76e051205d33911df12bd33b270ca
parenta63d0f55da87fc620c66f1b909d752d7c8b1159c
Merge branch 'PHP-5.6' into PHP-7.0
ext/openssl/openssl.c