]> granicus.if.org Git - php/commitdiff
Merge branch 'master' of git.php.net:/php-src
authorXinchen Hui <laruence@gmail.com>
Mon, 15 Jan 2018 13:34:03 +0000 (21:34 +0800)
committerXinchen Hui <laruence@gmail.com>
Mon, 15 Jan 2018 13:34:03 +0000 (21:34 +0800)
* 'master' of git.php.net:/php-src:
  Allow pecl like usage in ext/phar, closes #2955


Trivial merge