]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorXinchen Hui <laruence@php.net>
Fri, 5 Apr 2013 15:28:02 +0000 (23:28 +0800)
committerXinchen Hui <laruence@php.net>
Fri, 5 Apr 2013 15:28:02 +0000 (23:28 +0800)

Trivial merge