Merge branch 'PHP-5.6'
authorXinchen Hui <laruence@php.net>
Fri, 27 Dec 2013 06:11:41 +0000 (14:11 +0800)
committerXinchen Hui <laruence@php.net>
Fri, 27 Dec 2013 06:11:41 +0000 (14:11 +0800)

Trivial merge