]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
authorDmitry Stogov <dmitry@zend.com>
Fri, 13 Dec 2013 07:16:17 +0000 (11:16 +0400)
committerDmitry Stogov <dmitry@zend.com>
Fri, 13 Dec 2013 07:16:17 +0000 (11:16 +0400)
* 'PHP-5.5' of git.php.net:php-src:
  Use zend_error_noreturn here
  Add Tests for #65784 in 5.5
  Disallowed JMP into a finally block.
  Update NEWS for 5.5.7 release


Trivial merge