]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.3' into PHP-5.4
authorXinchen Hui <laruence@php.net>
Thu, 18 Oct 2012 12:13:36 +0000 (20:13 +0800)
committerXinchen Hui <laruence@php.net>
Thu, 18 Oct 2012 12:13:36 +0000 (20:13 +0800)
1  2 
ext/pcre/php_pcre.c

Simple merge