]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorXinchen Hui <laruence@php.net>
Thu, 3 Jul 2014 02:51:10 +0000 (10:51 +0800)
committerXinchen Hui <laruence@php.net>
Thu, 3 Jul 2014 02:51:10 +0000 (10:51 +0800)

Trivial merge