]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorXinchen Hui <laruence@php.net>
Mon, 10 Dec 2012 12:30:39 +0000 (20:30 +0800)
committerXinchen Hui <laruence@php.net>
Mon, 10 Dec 2012 12:30:39 +0000 (20:30 +0800)
1  2 
Zend/zend_compile.c

Simple merge