]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorAnatol Belski <ab@php.net>
Sun, 4 May 2014 22:51:40 +0000 (00:51 +0200)
committerAnatol Belski <ab@php.net>
Sun, 4 May 2014 22:51:40 +0000 (00:51 +0200)
commit149568f4da75a148d6ca71073b353f0d5f8f477a
treec851c97088e0573142cd0de3e054bf8ef6ba3fdd
parent53b4d2feea960afadd17e661df7d712b51017798
parent0d5121a3c7e499cb27c7d5aa14d5e6ad62ecde34
Merge branch 'PHP-5.6'

* PHP-5.6:
  fixed ZEND_DEBUG usage
Zend/zend.c