]> granicus.if.org Git - php/commitdiff
Merge branch 'master' of git.php.net:php-src
authorXinchen Hui <laruence@php.net>
Thu, 7 May 2015 11:25:41 +0000 (19:25 +0800)
committerXinchen Hui <laruence@php.net>
Thu, 7 May 2015 11:25:41 +0000 (19:25 +0800)

Trivial merge