Merge branch 'PHP-7.0'
authorRemi Collet <remi@php.net>
Sat, 20 Feb 2016 16:43:09 +0000 (17:43 +0100)
committerRemi Collet <remi@php.net>
Sat, 20 Feb 2016 16:43:09 +0000 (17:43 +0100)
* PHP-7.0:
  cleanup, ext/json is simple PHP now


Trivial merge