]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.3' of https://git.php.net/repository/php-src into PHP-5.3
authorChristopher Jones <sixd@php.net>
Thu, 20 Sep 2012 00:09:21 +0000 (17:09 -0700)
committerChristopher Jones <sixd@php.net>
Thu, 20 Sep 2012 00:09:21 +0000 (17:09 -0700)
* 'PHP-5.3' of https://git.php.net/repository/php-src:
  Fixed bug #61442 (exception threw in __autoload can not be catched)


Trivial merge