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

Simple merge