]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
authorChristopher Jones <sixd@php.net>
Thu, 15 Aug 2013 04:32:07 +0000 (21:32 -0700)
committerChristopher Jones <sixd@php.net>
Thu, 15 Aug 2013 04:32:07 +0000 (21:32 -0700)
* 'PHP-5.4' of https://git.php.net/repository/php-src:
  Fixed #65431 in zend_exception.c by Sixd


Trivial merge