]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4'
authorXinchen Hui <laruence@php.net>
Tue, 14 Aug 2012 16:32:42 +0000 (00:32 +0800)
committerXinchen Hui <laruence@php.net>
Tue, 14 Aug 2012 16:32:42 +0000 (00:32 +0800)

Trivial merge