]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorXinchen Hui <laruence@gmail.com>
Tue, 31 May 2016 09:23:03 +0000 (17:23 +0800)
committerXinchen Hui <laruence@gmail.com>
Tue, 31 May 2016 09:23:03 +0000 (17:23 +0800)
* PHP-7.0:
  No sure why this is failed in travis


Trivial merge