]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4'
authorXinchen Hui <laruence@php.net>
Thu, 22 Mar 2012 09:33:23 +0000 (17:33 +0800)
committerXinchen Hui <laruence@php.net>
Thu, 22 Mar 2012 09:33:23 +0000 (17:33 +0800)
commit191df5bd06a71b5f0f1015596ed27a902554a95a
tree113c45749f9196f9603674e531b7b9779a3d4e7e
parent31ae08b62f795c3e62dadf52d189d082f77a6556
parentdf129ae7ea983bab9947c97f15244870a748d729
Merge branch 'PHP-5.4'

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

Conflicts:
ext/mbstring/tests/mb_eregi_replace.phpt