]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.3' into PHP-5.4
authorXinchen Hui <laruence@php.net>
Thu, 22 Mar 2012 09:31:15 +0000 (17:31 +0800)
committerXinchen Hui <laruence@php.net>
Thu, 22 Mar 2012 09:31:15 +0000 (17:31 +0800)
commitdf129ae7ea983bab9947c97f15244870a748d729
treeabd22d84cf838da0974a3b7a5a36d6d99240023f
parent8254e21a688f2fe83f4cfe57617df792ae659d9a
parent523396cb28a0cb87ced9ec1179ef4f119d28ec80
Merge branch 'PHP-5.3' into PHP-5.4

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