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


Trivial merge