Merge branch 'PHP-5.4'

* PHP-5.4:
  Fix test, and merge the modification from trunk

Conflicts:
	ext/mbstring/tests/mb_eregi_replace.phpt
This commit is contained in:
Xinchen Hui 2012-03-22 17:33:23 +08:00
commit 191df5bd06

View File

@ -32,6 +32,6 @@ function do_translit($st) {
echo do_translit("Пеар");
?>
--EXPECT--
pear
Pear
--CREDITS--
Testfest Wuerzburg 2009-06-20 (modified by rui 2011-10-15)
Testfest Wuerzburg 2009-06-20 (modified by rui 2011-10-15)