]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.3' into PHP-5.4
authorXinchen Hui <laruence@php.net>
Wed, 5 Sep 2012 15:42:45 +0000 (23:42 +0800)
committerXinchen Hui <laruence@php.net>
Wed, 5 Sep 2012 15:42:45 +0000 (23:42 +0800)

Trivial merge