]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6' into PHP-7.0
authorRemi Collet <remi@php.net>
Wed, 20 Jan 2016 12:10:56 +0000 (13:10 +0100)
committerRemi Collet <remi@php.net>
Wed, 20 Jan 2016 12:10:56 +0000 (13:10 +0100)
* PHP-5.6:
  Fix test when run with openssl < 1.0.2 (reorder so no more SSLv2 message) Fix skip message to work


Trivial merge