]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.3' of ../php-5.3 into PHP-5.4
authorXinchen Hui <laruence@gmail.com>
Sat, 24 Mar 2012 06:22:53 +0000 (14:22 +0800)
committerXinchen Hui <laruence@gmail.com>
Sat, 24 Mar 2012 06:22:53 +0000 (14:22 +0800)
1  2 
ext/dom/php_dom.c

Simple merge