Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
authorXinchen Hui <laruence@php.net>
Mon, 4 Nov 2013 06:47:16 +0000 (14:47 +0800)
committerXinchen Hui <laruence@php.net>
Mon, 4 Nov 2013 06:47:16 +0000 (14:47 +0800)

Trivial merge