]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorXinchen Hui <laruence@php.net>
Fri, 27 Dec 2013 06:07:15 +0000 (14:07 +0800)
committerXinchen Hui <laruence@php.net>
Fri, 27 Dec 2013 06:07:15 +0000 (14:07 +0800)

Trivial merge