]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorAdam Harvey <aharvey@php.net>
Fri, 8 Aug 2014 19:02:56 +0000 (12:02 -0700)
committerAdam Harvey <aharvey@php.net>
Fri, 8 Aug 2014 19:02:56 +0000 (12:02 -0700)
* PHP-5.6:
  Add __debugInfo() to UPGRADING.


Trivial merge