]> granicus.if.org Git - php/commitdiff
Merge branch 'master' of git.php.net:/php-src
authorXinchen Hui <laruence@gmail.com>
Thu, 10 Dec 2015 13:47:36 +0000 (21:47 +0800)
committerXinchen Hui <laruence@gmail.com>
Thu, 10 Dec 2015 13:47:36 +0000 (21:47 +0800)

Trivial merge