]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 6a7088f e9f996c)
Merge branch 'PHP-5.4' into PHP-5.5
authorDmitry Stogov <dmitry@zend.com>
Mon, 25 Mar 2013 11:47:45 +0000 (15:47 +0400)
committerDmitry Stogov <dmitry@zend.com>
Mon, 25 Mar 2013 11:47:45 +0000 (15:47 +0400)
commit96e5f5eb05af913f8a9b9297393f153c561bf51b
tree4a1955276afd07a28aaa8aa08e4e971a6c5bc62ctree | snapshot
parent6a7088fd187f071df47fa09c6e215c916bfd699ccommit | diff
parente9f996c00d5cb6448dac1457dd9dae320c16904fcommit | diff
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed bug #63914 (zend_do_fcall_common_helper_SPEC does not handle exceptions properly). (Jeff Welch)

Conflicts:
NEWS
Zend/zend_vm_def.h
Zend/zend_vm_execute.h
Zend/zend_vm_def.h diff1 | diff2 | blob | history
Zend/zend_vm_execute.h diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.