]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 296a12e f1e37d0)
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)
* 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


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.