]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4'
authorXinchen Hui <laruence@php.net>
Wed, 18 Jul 2012 10:00:58 +0000 (18:00 +0800)
committerXinchen Hui <laruence@php.net>
Wed, 18 Jul 2012 10:00:58 +0000 (18:00 +0800)

Trivial merge