]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorStanislav Malyshev <stas@php.net>
Sun, 23 Jun 2013 20:54:50 +0000 (13:54 -0700)
committerStanislav Malyshev <stas@php.net>
Sun, 23 Jun 2013 20:54:50 +0000 (13:54 -0700)
commit7272e3e72232b4aa0374209b7779df440c9bdc33
tree4b93c59f73701d8ad2a9be2d58fccd30b3532276
parent296a12efbbdcb4db4a28b5744e3f3bd60e8fec9f
parentf1e37d03c117317f543d9ff68ea8e3e23da077bd
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Adding test to verify that __sleep can handle parent classes' private members
  Adding test to stabelize keys used when converting objects to arrays