]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5'
authorStanislav Malyshev <stas@php.net>
Mon, 19 Aug 2013 00:24:16 +0000 (17:24 -0700)
committerStanislav Malyshev <stas@php.net>
Mon, 19 Aug 2013 00:24:16 +0000 (17:24 -0700)
* PHP-5.5:
  Fix bug #65470 Segmentation fault in zend_error() with --enable-dtrace


Trivial merge