]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorMatteo Beccati <mbeccati@php.net>
Mon, 4 Apr 2016 22:07:28 +0000 (00:07 +0200)
committerMatteo Beccati <mbeccati@php.net>
Mon, 4 Apr 2016 22:07:28 +0000 (00:07 +0200)
* PHP-7.0:
  Fixed bug #71447 (Quotes inside comments not properly handled)
  Fixed a few PDO tests to conform to PDO Common standards
  news entry #69537
  Fix #69537: __debugInfo with empty string for key gives error


Trivial merge