]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.3' into PHP-5.4
authorXinchen Hui <laruence@php.net>
Fri, 28 Sep 2012 07:03:52 +0000 (15:03 +0800)
committerXinchen Hui <laruence@php.net>
Fri, 28 Sep 2012 07:03:52 +0000 (15:03 +0800)

Trivial merge