From: Dmitry Stogov <dmitry@zend.com>
Date: Wed, 9 Jan 2013 07:32:40 +0000 (+0400)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0alpha3~4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=326f896739785cfcd36ef918dbd399ac605f6552;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed bug #63882 (zend_std_compare_objects crash on recursion)

Conflicts:
	NEWS
---

326f896739785cfcd36ef918dbd399ac605f6552