]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4'
authorXinchen Hui <laruence@php.net>
Wed, 19 Sep 2012 11:52:38 +0000 (19:52 +0800)
committerXinchen Hui <laruence@php.net>
Wed, 19 Sep 2012 11:52:38 +0000 (19:52 +0800)

Trivial merge