]> granicus.if.org Git - php/commitdiff
Merge remote branch 'origin/PHP-5.6'
authorXinchen Hui <laruence@php.net>
Sun, 29 Jun 2014 10:06:44 +0000 (18:06 +0800)
committerXinchen Hui <laruence@php.net>
Sun, 29 Jun 2014 10:06:44 +0000 (18:06 +0800)

Trivial merge