]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorXinchen Hui <laruence@gmail.com>
Tue, 31 May 2016 08:48:33 +0000 (16:48 +0800)
committerXinchen Hui <laruence@gmail.com>
Tue, 31 May 2016 08:48:33 +0000 (16:48 +0800)
* PHP-7.0:
  Attempt to fix tests fails


Trivial merge