]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4'
authorXinchen Hui <laruence@php.net>
Sun, 19 Aug 2012 10:34:17 +0000 (18:34 +0800)
committerXinchen Hui <laruence@php.net>
Sun, 19 Aug 2012 10:34:17 +0000 (18:34 +0800)

Trivial merge