]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorDmitry Stogov <dmitry@zend.com>
Tue, 21 May 2013 06:15:37 +0000 (10:15 +0400)
committerDmitry Stogov <dmitry@zend.com>
Tue, 21 May 2013 06:15:37 +0000 (10:15 +0400)
commita2d6d274584d5df2aa9c040396066d30ffd44d82
tree7b1d2b071468d3c12f7e5bd7cf6b1b8f2c85f6bd
parent49c1a223d5ba14df3689de5bdb80f5031378a955
parent77fffff15762137e2d8173df9b733b4cb70fc996
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed bug #64720 (SegFault on zend_deactivate)

Conflicts:
NEWS
NEWS
Zend/zend_object_handlers.c
Zend/zend_opcode.c