diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2013-01-09 11:32:40 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2013-01-09 11:32:40 +0400 |
| commit | 326f896739785cfcd36ef918dbd399ac605f6552 (patch) | |
| tree | 2a710fd908ad52afeeb56c1064bbc08cd76cd6c9 /Zend/zend_alloc.h | |
| parent | 6deb8361f32d14fffdd284b47b59cd5dd50baf80 (diff) | |
| parent | f9e8678dd3a41ed8a100d8201153a41d6fd25f2e (diff) | |
| download | php-git-326f896739785cfcd36ef918dbd399ac605f6552.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fixed bug #63882 (zend_std_compare_objects crash on recursion)
Conflicts:
NEWS
Diffstat (limited to 'Zend/zend_alloc.h')
0 files changed, 0 insertions, 0 deletions