]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorNikita Popov <nikic@php.net>
Fri, 3 Oct 2014 19:30:06 +0000 (21:30 +0200)
committerNikita Popov <nikic@php.net>
Fri, 3 Oct 2014 19:30:06 +0000 (21:30 +0200)
commit443374675e6ccbc26c2a8243f3311f0db69bf3cb
treec18ff2b0cde0f0fd18de0bdbe099a5979c9b884b
parente7623f470f3c43396db4adcceeb63bd7029bc5ff
parent8617f2fa8d6feeda4c87e1c0f8697101f03429f2
Merge branch 'PHP-5.6'

Conflicts:
Zend/zend_object_handlers.c
Zend/zend_object_handlers.c