]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorXinchen Hui <laruence@gmail.com>
Tue, 31 May 2016 08:56:12 +0000 (16:56 +0800)
committerXinchen Hui <laruence@gmail.com>
Tue, 31 May 2016 08:56:12 +0000 (16:56 +0800)
* PHP-7.0:
  Fixed test (keyword is local related)


Trivial merge