]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4'
authorDmitry Stogov <dmitry@zend.com>
Thu, 6 Sep 2012 10:03:22 +0000 (14:03 +0400)
committerDmitry Stogov <dmitry@zend.com>
Thu, 6 Sep 2012 10:03:22 +0000 (14:03 +0400)
* PHP-5.4:
  - Fixed bug #61767 (Shutdown functions not called in certain error situation) - Fixed bug #60909 (custom error handler throwing Exception + fatal error = no shutdown function)

Conflicts:
NEWS


Trivial merge