]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorNikita Popov <nikic@php.net>
Sat, 4 Jan 2014 00:24:54 +0000 (01:24 +0100)
committerNikita Popov <nikic@php.net>
Sat, 4 Jan 2014 00:24:54 +0000 (01:24 +0100)
1  2 
Zend/zend_object_handlers.c

Simple merge