]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorDmitry Stogov <dmitry@zend.com>
Wed, 9 Jan 2013 07:32:40 +0000 (11:32 +0400)
committerDmitry Stogov <dmitry@zend.com>
Wed, 9 Jan 2013 07:32:40 +0000 (11:32 +0400)
* PHP-5.4:
  Fixed bug #63882 (zend_std_compare_objects crash on recursion)

Conflicts:
NEWS


Trivial merge