]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5'
authorStanislav Malyshev <stas@php.net>
Sun, 23 Jun 2013 20:55:03 +0000 (13:55 -0700)
committerStanislav Malyshev <stas@php.net>
Sun, 23 Jun 2013 20:55:03 +0000 (13:55 -0700)
* PHP-5.5:
  Adding test to verify that __sleep can handle parent classes' private members
  Adding test to stabelize keys used when converting objects to arrays


Trivial merge