]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorXinchen Hui <laruence@php.net>
Thu, 25 Dec 2014 11:21:48 +0000 (06:21 -0500)
committerXinchen Hui <laruence@php.net>
Thu, 25 Dec 2014 11:21:48 +0000 (06:21 -0500)

Trivial merge