Merge branch 'PHP-5.5' into PHP-5.6
authorXinchen Hui <laruence@php.net>
Mon, 30 Dec 2013 03:07:37 +0000 (11:07 +0800)
committerXinchen Hui <laruence@php.net>
Mon, 30 Dec 2013 03:07:37 +0000 (11:07 +0800)

Trivial merge