]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorXinchen Hui <laruence@php.net>
Mon, 1 Apr 2013 10:17:28 +0000 (18:17 +0800)
committerXinchen Hui <laruence@php.net>
Mon, 1 Apr 2013 10:17:28 +0000 (18:17 +0800)

Trivial merge