From: Stanislav Malyshev <stas@php.net>
Date: Sun, 23 Jun 2013 20:54:50 +0000 (-0700)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.2RC1~45
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7272e3e72232b4aa0374209b7779df440c9bdc33;p=php

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
---

7272e3e72232b4aa0374209b7779df440c9bdc33