]> granicus.if.org Git - php/commitdiff
Merge branch 'master' of git.php.net:/php-src
authorXinchen Hui <laruence@gmail.com>
Fri, 9 Sep 2016 14:41:42 +0000 (22:41 +0800)
committerXinchen Hui <laruence@gmail.com>
Fri, 9 Sep 2016 14:41:42 +0000 (22:41 +0800)
* 'master' of git.php.net:/php-src:


Trivial merge