]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4'
authorXinchen Hui <laruence@php.net>
Fri, 2 Nov 2012 10:57:56 +0000 (18:57 +0800)
committerXinchen Hui <laruence@php.net>
Fri, 2 Nov 2012 10:57:56 +0000 (18:57 +0800)

Trivial merge